tree 535f15a1a395a5043ba60436ca99dc66484dd21f
parent 88f399cd0a5a540db2815eee3002f8f00ef6461e
author Dave Airlie <[EMAIL PROTECTED](none)> Tue, 23 Aug 2005 12:15:43 +1000
committer Dave Airlie <[EMAIL PROTECTED]> Tue, 23 Aug 2005 12:15:43 +1000
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 <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
drivers/char/drm/drm_agpsupport.c | 5 -----
1 files changed, 5 deletions(-)
diff --git a/drivers/char/drm/drm_agpsupport.c
b/drivers/char/drm/drm_agpsupport.c
--- 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_
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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
