diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-09 23:26:27 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-09 23:26:27 +0000 |
| commit | 8033d7423267fc1b3725df6a077dd910b586daaf (patch) | |
| tree | 050f5fe847ecdd66c0df0f48401afa00469fdfda /src/radeon.h | |
| parent | c637939d3c4ce5cdddbc5200d5ffbca4c3927050 (diff) | |
More memory map fixes !!! This time, we add a way to get the DRM kernel
module version early, in order to properly limit the framebuffer size
when a module that doesn't support the new map is loaded. That will
improve backward compatibility. I also made the minimum required kernel
module version 1.3 which hopefully shouldn't be a problem for anybody,
and cleaned up the ordering in which we test for DRM version to enable
features
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/radeon.h b/src/radeon.h index 355c64c..fc694c7 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -348,7 +348,8 @@ typedef struct { CARD32 MemCntl; CARD32 BusCntl; unsigned long FbMapSize; /* Size of frame buffer, in bytes */ - unsigned long FbSecureSize; /* Size of secured fb area at end of framebuffer */ + unsigned long FbSecureSize; /* Size of secured fb area at end of + framebuffer */ int Flags; /* Saved copy of mode flags */ /* VE/M6 support */ @@ -490,9 +491,12 @@ typedef struct { RADEONFBLayout CurrentLayout; CARD32 dst_pitch_offset; #ifdef XF86DRI - Bool noBackBuffer; + Bool noBackBuffer; Bool directRenderingEnabled; Bool directRenderingInited; + Bool newMemoryMap; + drmVersionPtr pLibDRMVersion; + drmVersionPtr pKernelDRMVersion; DRIInfoPtr pDRIInfo; int drmFD; int numVisualConfigs; @@ -512,7 +516,6 @@ typedef struct { Bool depthMoves; /* Enable depth moves -- slow! */ Bool allowPageFlip; /* Enable 3d page flipping */ Bool have3DWindows; /* Are there any 3d clients? */ - int drmMinor; drmSize gartSize; drm_handle_t agpMemHandle; /* Handle from drmAgpAlloc */ @@ -777,6 +780,7 @@ extern void RADEONPllErrataAfterData(RADEONInfoPtr info); #ifdef USE_XAA extern void RADEONAccelInitCP(ScreenPtr pScreen, XAAInfoRecPtr a); #endif +extern Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn); extern Bool RADEONDRIScreenInit(ScreenPtr pScreen); extern void RADEONDRICloseScreen(ScreenPtr pScreen); extern void RADEONDRIResume(ScreenPtr pScreen); |