aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-08-22 22:15:43 -0400
committerDave Airlie <airlied@linux.ie>2005-08-22 22:15:43 -0400
commit7a9aff3cff807261e476a1719273a4ac5d254ecb (patch)
tree535f15a1a395a5043ba60436ca99dc66484dd21f /drivers/char/drm
parent88f399cd0a5a540db2815eee3002f8f00ef6461e (diff)
drm: fix a bad VERSION check.
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>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r--drivers/char/drm/drm_agpsupport.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c
index ffb4acaefe84..8c215adcb4b2 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
@@ -426,13 +426,8 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
426 return NULL; 426 return NULL;
427 } 427 }
428 head->memory = NULL; 428 head->memory = NULL;
429#if LINUX_VERSION_CODE <= 0x020408
430 head->cant_use_aperture = 0;
431 head->page_mask = ~(0xfff);
432#else
433 head->cant_use_aperture = head->agp_info.cant_use_aperture; 429 head->cant_use_aperture = head->agp_info.cant_use_aperture;
434 head->page_mask = head->agp_info.page_mask; 430 head->page_mask = head->agp_info.page_mask;
435#endif
436 431
437 return head; 432 return head;
438} 433}