Commit 7a9aff3c authored Aug 23, 2005 by Dave Airlie Committed by Dave Airlie Aug 23, 2005

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>

parent 88f399cd

drivers/char/drm/drm_agpsupport.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}