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>

authored by David Miller and committed by Linus Torvalds efc49181 f6ac436d

+5 -4
+2 -2
drivers/video/aty/radeon_accel.c
··· 241 241 INREG(HOST_PATH_CNTL); 242 242 OUTREG(HOST_PATH_CNTL, host_path_cntl); 243 243 244 - if (rinfo->family != CHIP_FAMILY_R300 || 245 - rinfo->family != CHIP_FAMILY_R350 || 244 + if (rinfo->family != CHIP_FAMILY_R300 && 245 + rinfo->family != CHIP_FAMILY_R350 && 246 246 rinfo->family != CHIP_FAMILY_RV350) 247 247 OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset); 248 248
+3 -2
include/video/radeon.h
··· 527 527 528 528 529 529 /* DSTCACHE_CTLSTAT bit constants */ 530 - #define RB2D_DC_FLUSH (3 << 0) 531 - #define RB2D_DC_FLUSH_ALL 0xf 530 + #define RB2D_DC_FLUSH_2D (1 << 0) 531 + #define RB2D_DC_FREE_2D (1 << 2) 532 + #define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D) 532 533 #define RB2D_DC_BUSY (1 << 31) 533 534 534 535