aboutsummaryrefslogtreecommitdiffstats
path: root/include/video/radeon.h
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2008-08-05 13:01:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-05 14:33:49 -0700
commitefc491814308f89d5ef6c4fe19ae4552a67d4132 (patch)
tree2e00231a9ac9221ebb52cedf8249db0441603094 /include/video/radeon.h
parentf6ac436dcc4c34709bcde355f3f2254ac0a183d4 (diff)
downloadmrst-s0i3-test-efc491814308f89d5ef6c4fe19ae4552a67d4132.tar.gz
mrst-s0i3-test-efc491814308f89d5ef6c4fe19ae4552a67d4132.tar.xz
mrst-s0i3-test-efc491814308f89d5ef6c4fe19ae4552a67d4132.zip
radeon: misc corrections
I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that hangs in my sparc64 boxes when the init scripts set the font. The problem goes away if I disable acceleration. I haven't figured out that bug yet, but along the way I found some corrections to make based upon some auditing. 1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver and the XORG video driver differ. I've made the kernel match what XORG is using. 2) In radeonfb_engine_reset() we have top-level code structure that roughly looks like: if (family is 300, 350, or V350) do this; else do that; ... if (family is NOT 300, OR family is NOT 350, OR family is NOT V350) do another thing; this last conditional makes no sense, is always true, and obviously was likely meant to be "family is NOT 300, 350, or V350". So I've made the code match the intent. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/video/radeon.h')
-rw-r--r--include/video/radeon.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/video/radeon.h b/include/video/radeon.h
index 83467e18f5e..95a1f2038b1 100644
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -527,8 +527,9 @@
/* DSTCACHE_CTLSTAT bit constants */
-#define RB2D_DC_FLUSH (3 << 0)
-#define RB2D_DC_FLUSH_ALL 0xf
+#define RB2D_DC_FLUSH_2D (1 << 0)
+#define RB2D_DC_FREE_2D (1 << 2)
+#define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D)
#define RB2D_DC_BUSY (1 << 31)