rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.67, 1.68 kernel.spec, 1.1198, 1.1199

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2605

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- radeon drm: fix broken caching bits in radeon which broke AGP


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- drm-modesetting-radeon.patch	11 Dec 2008 23:10:45 -0000	1.67
+++ drm-modesetting-radeon.patch	18 Dec 2008 05:22:42 -0000	1.68
@@ -1,3 +1,11 @@
+commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Dec 18 23:01:12 2008 +1000
+
+    drm: don't set cached bits on pages from uncached allocator.
+    
+    This should make AGP no corrupt itself to all buggery
+
 commit 6869ac2062aa32d24a13b66630e733864cf8cdda
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Dec 11 01:35:09 2008 +1000
@@ -2135,10 +2143,10 @@
  	return -EINVAL;
 diff --git a/drivers/gpu/drm/drm_bo.c b/drivers/gpu/drm/drm_bo.c
 new file mode 100644
-index 0000000..84931d2
+index 0000000..8a38f4a
 --- /dev/null
 +++ b/drivers/gpu/drm/drm_bo.c
-@@ -0,0 +1,2159 @@
+@@ -0,0 +1,2162 @@
 +/**************************************************************************
 + *
 + * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -3671,10 +3679,13 @@
 +	bo->mem.page_alignment = page_alignment;
 +	bo->buffer_start = buffer_start & PAGE_MASK;
 +	bo->priv_flags = 0;
-+	bo->mem.flags = (DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_CACHED |
++	bo->mem.flags = (DRM_BO_FLAG_MEM_LOCAL |
 +			 DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_CLEAN);
 +	bo->mem.proposed_flags = 0;
 +	atomic_inc(&bm->count);
++
++	if (dev->bm.allocator_type == _DRM_BM_ALLOCATOR_CACHED)
++		bo->mem.flags |= DRM_BO_FLAG_CACHED;
 +	/*
 +	 * Use drm_bo_modify_proposed_flags to error-check the proposed flags
 +	 */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1198
retrieving revision 1.1199
diff -u -r1.1198 -r1.1199
--- kernel.spec	17 Dec 2008 19:41:59 -0000	1.1198
+++ kernel.spec	18 Dec 2008 05:22:43 -0000	1.1199
@@ -1941,6 +1941,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Dec 18 2008 Dave Airlie <airlied at redhat.com> 2.6.27.9-163
+- radeon drm: fix broken caching bits in radeon which broke AGP
+
 * Wed Dec 17 2008 John W. Linville <linville at redhat.com> 2.6.27.9-162
 - iwlwifi: use GFP_KERNEL to allocate Rx SKB memory