[kernel] r14533 - in dists/trunk/linux-2.6/debian/patches: debian/dfsg series

[Ben Hutchings]

Author: benh
Date: Tue Nov  3 01:07:16 2009
New Revision: 14533

Log:
drm/radeon/r600: add clarifying comment to r600 blit code

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch	Tue Nov  3 01:07:16 2009	(r14533)
@@ -0,0 +1,42 @@
+From ef75f31784181c33ee7d42e361ad8d04947a2153 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon, 2 Nov 2009 19:51:42 -0500
+Subject: [PATCH] drm/radeon/r600: add clarifying comment to r600 blit code
+
+R6xx+ cards need to use the 3D engine to blit data which requires
+quite a bit of hw state setup.  Rather than pull the whole 3D driver
+(which normally generates the 3D state) into the DRM, we opt to use
+statically generated state tables.  The regsiter state and shaders
+were hand generated to support blitting functionality.  See the 3D
+driver or documentation for descriptions of the registers and
+shader instructions.
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+---
+ drivers/gpu/drm/radeon/r600_blit_shaders.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
+index d745e81..5d479cf 100644
+--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
++++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
+@@ -2,6 +2,16 @@
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ 
++/*
++ * R6xx+ cards need to use the 3D engine to blit data which requires
++ * quite a bit of hw state setup.  Rather than pull the whole 3D driver
++ * (which normally generates the 3D state) into the DRM, we opt to use
++ * statically generated state tables.  The regsiter state and shaders
++ * were hand generated to support blitting functionality.  See the 3D
++ * driver or documentation for descriptions of the registers and
++ * shader instructions.
++ */
++
+ const u32 r6xx_default_state[] =
+ {
+ 	0xc0002400,
+-- 
+1.5.6.3
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov  1 00:59:45 2009	(r14532)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue Nov  3 01:07:16 2009	(r14533)
@@ -41,3 +41,4 @@
 + bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch 
 + bugfix/all/hfsplus-limit-to-2tb.patch
 + bugfix/all/cpuidle-return-with-irq-enabled.patch
++ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Sun Nov  1 00:59:45 2009	(r14532)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Tue Nov  3 01:07:16 2009	(r14533)
@@ -12,6 +12,5 @@
 X debian/dfsg/files-1
 
 # TODO for 2.6.32:
-# drivers/gpu/drm/radeon/r600_blit_shaders.c: r{6,7}xx_default_state
 # drivers/media/dvb/frontends/lgs8gxx.c: lgs8g75_initdat
 # drivers/net/r8169.c: phy_reg_init_2 in rtl8168d_{1,2}_hw_phy_config()