rpms/kernel/devel drm-modesetting-radeon.patch, 1.38, 1.39 kernel.spec, 1.1065, 1.1066

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23024

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- radeon: fix VRAM sizing issue


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- drm-modesetting-radeon.patch	20 Oct 2008 03:49:51 -0000	1.38
+++ drm-modesetting-radeon.patch	20 Oct 2008 04:49:19 -0000	1.39
@@ -1,3 +1,12 @@
+commit 9d7a3bf0e8bda9845c6fee4ddc20a4bdd9ec3cf7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 14:44:23 2008 +1000
+
+    radeon: fix accessible VRAM sizing.
+    
+    We actually were passing accessible to userspace, but I thought
+    the code sized it correctly, however it doesn't seem to.
+
 commit c7adf6d25db7fad1d4e58ea64ca08e79a38ed85e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 13:41:05 2008 +1000
@@ -29178,10 +29187,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..5e2ad98
+index 0000000..5ecd8c5
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1611 @@
+@@ -0,0 +1,1614 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -29769,6 +29778,9 @@
 +	if (accessible > bar_size)
 +		accessible = bar_size;
 +
++	if (accessible > vram)
++		accessible = vram;
++
 +	DRM_INFO("Detected VRAM RAM=%dK, accessible=%uK, BAR=%uK\n",
 +		 vram, accessible, bar_size);
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -r1.1065 -r1.1066
--- kernel.spec	20 Oct 2008 03:49:51 -0000	1.1065
+++ kernel.spec	20 Oct 2008 04:49:19 -0000	1.1066
@@ -1841,6 +1841,9 @@
 
 %changelog
 * Mon Oct 20 2008 Dave Airlie <airlied at redhat.com> 
+- radeon: fix VRAM sizing issue
+
+* Mon Oct 20 2008 Dave Airlie <airlied at redhat.com> 
 - radeon: fix writeback + some warning fixes
 
 * Sun Oct 19 2008 Dave Jones <davej at redhat.com>