summaryrefslogtreecommitdiff
path: root/src/radeon_dri.c
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2006-05-09 14:40:23 +0000
committerMichel Daenzer <michel@daenzer.net>2006-05-09 14:40:23 +0000
commitede75fe2b1850a4d9f03c724b7c1d1ed65e60f2f (patch)
treefea15b86c61cb74c541f318ee7db5c13ac95bcd9 /src/radeon_dri.c
parentbc93a46c4fe499f23b9c0ff52e2e36b4c587f7d6 (diff)
Drop support for radeon DRM <= 1.7. The 2.4 kernel has version 1.7, and
various problems up to system hangs on X server startup have been reported with that and DRI enabled.
Diffstat (limited to 'src/radeon_dri.c')
-rw-r--r--src/radeon_dri.c33
1 files changed, 12 insertions, 21 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 9f9895dc..62543cab 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1094,24 +1094,18 @@ static void RADEONDRIGartHeapInit(RADEONInfoPtr info, ScreenPtr pScreen)
drmRadeonMemInitHeap drmHeap;
/* Start up the simple memory manager for GART space */
- if (info->pKernelDRMVersion->version_minor >= 6) {
- drmHeap.region = RADEON_MEM_REGION_GART;
- drmHeap.start = 0;
- drmHeap.size = info->gartTexMapSize;
-
- if (drmCommandWrite(info->drmFD, DRM_RADEON_INIT_HEAP,
- &drmHeap, sizeof(drmHeap))) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[drm] Failed to initialize GART heap manager\n");
- } else {
- xf86DrvMsg(pScreen->myNum, X_INFO,
- "[drm] Initialized kernel GART heap manager, %d\n",
- info->gartTexMapSize);
- }
+ drmHeap.region = RADEON_MEM_REGION_GART;
+ drmHeap.start = 0;
+ drmHeap.size = info->gartTexMapSize;
+
+ if (drmCommandWrite(info->drmFD, DRM_RADEON_INIT_HEAP,
+ &drmHeap, sizeof(drmHeap))) {
+ xf86DrvMsg(pScreen->myNum, X_ERROR,
+ "[drm] Failed to initialize GART heap manager\n");
} else {
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[drm] Kernel module too old (1.%d) for GART heap manager\n",
- info->pKernelDRMVersion->version_minor);
+ "[drm] Initialized kernel GART heap manager, %d\n",
+ info->gartTexMapSize);
}
}
@@ -1296,11 +1290,8 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
} else if (info->IsIGP) {
req_minor = 10;
req_patch = 0;
- } else if (info->ChipFamily >= CHIP_FAMILY_R200) {
- req_minor = 5;
- req_patch = 0;
- } else {
- req_minor = 3;
+ } else { /* Many problems have been reported with 1.7 in the 2.4 kernel */
+ req_minor = 8;
req_patch = 0;
}