rpms/kernel/devel drm-modesetting-radeon.patch, 1.10, 1.11 kernel.spec, 1.882, 1.883

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
- disable kernel doc again the build falls over


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- drm-modesetting-radeon.patch	14 Aug 2008 05:40:29 -0000	1.10
+++ drm-modesetting-radeon.patch	14 Aug 2008 08:20:31 -0000	1.11
@@ -33947,10 +33947,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..88d4efe
+index 0000000..82113c5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1254 @@
+@@ -0,0 +1,1258 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -34646,6 +34646,7 @@
 +{
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	int ret;
++	u32 pg_offset;
 +
 +	/* init TTM underneath */
 +	drm_bo_driver_init(dev);
@@ -34655,8 +34656,11 @@
 +	
 +	radeon_init_memory_map(dev);
 +
-+	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/
-+		       (dev_priv->mm.vram_visible) >> PAGE_SHIFT,
++#define VRAM_RESERVE_TEXT (64*1024)
++	dev_priv->mm.vram_visible -= VRAM_RESERVE_TEXT;
++	pg_offset = VRAM_RESERVE_TEXT >> PAGE_SHIFT;
++	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, pg_offset, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/
++		       ((dev_priv->mm.vram_visible) >> PAGE_SHIFT) - 16,
 +		       0);
 +
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -r1.882 -r1.883
--- kernel.spec	14 Aug 2008 06:32:51 -0000	1.882
+++ kernel.spec	14 Aug 2008 08:20:31 -0000	1.883
@@ -1746,6 +1746,9 @@
 
 %changelog
 * Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
+- reserve some memory for text mode on radeons
+
+* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>
 - disable kernel doc again the build falls over
 
 * Thu Aug 14 2008 Dave Airlie <airlied at redhat.com>