drm: fix a bad VERSION check.
authorDave Airlie <airlied@starflyer.(none)>
Tue, 23 Aug 2005 02:15:43 +0000 (12:15 +1000)
committerDave Airlie <airlied@linux.ie>
Tue, 23 Aug 2005 02:15:43 +0000 (12:15 +1000)
I found why my G5 was crashing when using the linux-2.6 version of the
DRM + git-drm.patch from 2.6.13-rc6-mm1, but not with the CVS DRM.
The reason was that dev->agp->cant_use_aperture wasn't getting set,
and the reason for that was that <linux/version.h> no longer gets
included and the #if LINUX_VERSION_CODE < 0x020408 in drm_agpsupport.c
was going the wrong way.  With this patch (and a few others) a 32-bit
server works correctly, as does DRI.

From: Paul Mackerras <paulus@samba.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drm_agpsupport.c

index ffb4acaefe847cfd5394ad23a4252b6788648a7b..8c215adcb4b2b623e4848b50fba212a66956799a 100644 (file)
@@ -426,13 +426,8 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
                return NULL;
        }
        head->memory = NULL;
-#if LINUX_VERSION_CODE <= 0x020408
-       head->cant_use_aperture = 0;
-       head->page_mask = ~(0xfff);
-#else
        head->cant_use_aperture = head->agp_info.cant_use_aperture;
        head->page_mask = head->agp_info.page_mask;
-#endif
 
        return head;
 }