rpms/kernel/devel drm-modesetting-radeon.patch, 1.32, 1.33 kernel.spec, 1.1015, 1.1016 drm-fix-drm-mode-h.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Removed Files:
	drm-fix-drm-mode-h.patch 
Log Message:
- drm-modesetting-radeon.patch - fix drm mode header + Xv alignment 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- drm-modesetting-radeon.patch	1 Oct 2008 03:09:24 -0000	1.32
+++ drm-modesetting-radeon.patch	6 Oct 2008 06:28:00 -0000	1.33
@@ -1,3 +1,17 @@
+commit 3f61a04bd2af318f8fdfa2558bac646b069a7b73
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 6 16:20:38 2008 +1000
+
+    radeon: fixup alignment between GEM and TTM
+    
+    fixup the interface between gem and ttm for alignment. makes Xv work better
+
+commit 18c1f0f0716ac15b594d0d7e65105859048aef41
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 6 12:10:05 2008 +1000
+
+    drm: fix kbuild export of drm_mode.h
+
 commit 9ca2633c13cdba9da4fa76402bf6fdf81a104c89
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 1 11:27:02 2008 +1000
@@ -37274,10 +37288,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..b9c3b80
+index 0000000..225f026
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1598 @@
+@@ -0,0 +1,1608 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -37360,10 +37374,11 @@
 +	struct drm_radeon_gem_object *obj_priv;
 +	int ret;
 +	uint32_t flags;
++	uint32_t page_align;
 +
 +	obj = drm_gem_object_alloc(dev, size);
 +	if (!obj)
-+		return NULL;;
++		return NULL;
 +
 +	obj_priv = obj->driver_private;
 +	flags = DRM_BO_FLAG_MAPPABLE;
@@ -37375,10 +37390,15 @@
 +		flags |= DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_CACHED;
 +
 +	flags |= DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE;
++
++	if (alignment == 0)
++		alignment = PAGE_SIZE;
++
++	page_align = alignment >> PAGE_SHIFT;
 +	/* create a TTM BO */
 +	ret = drm_buffer_object_create(dev,
 +				       size, drm_bo_type_device,
-+				       flags, 0, alignment,
++				       flags, 0, page_align,
 +				       0, &obj_priv->bo);
 +	if (ret)
 +		goto fail;
@@ -37468,10 +37488,14 @@
 +			flags = DRM_BO_FLAG_MEM_TT;
 +		else if ((obj_priv->bo->mem.mem_type == DRM_BO_MEM_LOCAL) && (read_domains & RADEON_GEM_DOMAIN_GTT))
 +			flags = DRM_BO_FLAG_MEM_TT;
-+		else if (read_domains & RADEON_GEM_DOMAIN_VRAM)
-+			flags = DRM_BO_FLAG_MEM_VRAM;
-+		else if (read_domains & RADEON_GEM_DOMAIN_GTT)
-+			flags = DRM_BO_FLAG_MEM_TT;
++
++		/* no idea here just set whatever we are input */
++		if (flags == 0) {
++			if (read_domains & RADEON_GEM_DOMAIN_VRAM)
++				flags |= DRM_BO_FLAG_MEM_VRAM;
++			if (read_domains & RADEON_GEM_DOMAIN_GTT)
++				flags |= DRM_BO_FLAG_MEM_TT;
++		}
 +	}
 +
 +	/* if this BO is pinned then we ain't moving it anywhere */
@@ -48393,6 +48417,16 @@
  /*
   * By replacing the four outb_p with two back to back outw, we can reduce
   * the window of opportunity to see text mislocated to the RHS of the
+diff --git a/include/drm/Kbuild b/include/drm/Kbuild
+index 82b6983..b940fdf 100644
+--- a/include/drm/Kbuild
++++ b/include/drm/Kbuild
+@@ -1,4 +1,4 @@
+-unifdef-y += drm.h drm_sarea.h
++unifdef-y += drm.h drm_sarea.h drm_mode.h
+ unifdef-y += i810_drm.h
+ unifdef-y += i830_drm.h
+ unifdef-y += i915_drm.h
 diff --git a/include/drm/drm.h b/include/drm/drm.h
 index 38d3c6b..e1909b1 100644
 --- a/include/drm/drm.h


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1015
retrieving revision 1.1016
diff -u -r1.1015 -r1.1016
--- kernel.spec	6 Oct 2008 02:17:33 -0000	1.1015
+++ kernel.spec	6 Oct 2008 06:28:00 -0000	1.1016
@@ -630,7 +630,6 @@
 Patch1811: drm-modesetting-radeon.patch
 Patch1812: drm-modesetting-i915.patch
 Patch1813: drm-nouveau.patch
-Patch1814: drm-fix-drm-mode-h.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1180,7 +1179,6 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-modesetting-i915.patch
 ApplyPatch drm-nouveau.patch
-ApplyPatch drm-fix-drm-mode-h.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1779,6 +1777,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 06 2008 Dave Airlie <airlied at redhat.com>
+- drm-modesetting-radeon.patch - fix drm mode header + Xv alignment issue
+
 * Sun Oct 05 2008 Dave Airlie <airlied at redhat.com>
 - drm-fix-drm-mode-h.patch - fix drm mode .h header
 


--- drm-fix-drm-mode-h.patch DELETED ---