diff options
author | David S. Miller <davem@davemloft.net> | 2007-12-28 23:55:06 +0200 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2007-12-28 23:56:27 +0200 |
commit | 843d93e775cd46a0e24e1a725594fa2d942f14ba (patch) | |
tree | cf243c3b13fb39e0f1acdb3b5911522ee7bdfb16 /src/ffb_drishare.h | |
parent | 5c1e059cfed608b1f051cc8825c1243db76e8995 (diff) |
Remove DRI support to fix build after devPrivates rework
This driver uses devprivates of all kinds, but this is
only done in deprecated and unused code so we can simply
remove it all.
DRM/DRI support has been commented out for years, and was
done during the conversion over to XAA acceleration. This
code would need to be essentially rewritten to work again,
so we can just remove this stuff for now.
The rest were either:
1) DRI/DRM related uses
2) the private allocation code
3) cases that could index to the pScrn to get the FFB private
And that's all fixed up here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'src/ffb_drishare.h')
-rw-r--r-- | src/ffb_drishare.h | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h deleted file mode 100644 index d4f4a08..0000000 --- a/src/ffb_drishare.h +++ /dev/null @@ -1,48 +0,0 @@ -/* $XFree86$ */ - -#ifndef _FFB_DRISHARE_H -#define _FFB_DRISHARE_H - -typedef struct ffb_dri_state { - int flags; -#define FFB_DRI_FFB2 0x00000001 -#define FFB_DRI_FFB2PLUS 0x00000002 -#define FFB_DRI_PAC1 0x00000004 -#define FFB_DRI_PAC2 0x00000008 - - /* Indexed by DRI drawable id. */ -#define FFB_DRI_NWIDS 64 - unsigned int wid_table[FFB_DRI_NWIDS]; -} ffb_dri_state_t; - -#define FFB_DRISHARE(SAREA) \ - ((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(drm_sarea_t))) - -typedef struct { - drm_handle_t hFbcRegs; - drmSize sFbcRegs; - - drm_handle_t hDacRegs; - drmSize sDacRegs; - - drm_handle_t hSfb8r; - drmSize sSfb8r; - - drm_handle_t hSfb32; - drmSize sSfb32; - - drm_handle_t hSfb64; - drmSize sSfb64; - - /* Fastfill/Pagefill parameters. */ - unsigned char disable_pagefill; - int fastfill_small_area; - int pagefill_small_area; - int fastfill_height; - int fastfill_width; - int pagefill_height; - int pagefill_width; - short Pf_AlignTab[0x800]; -} FFBDRIRec, *FFBDRIPtr; - -#endif /* !(_FFB_DRISHARE_H) */ |