xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/evergreen_accel.c |    3 ++-
 src/evergreen_reg.h   |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e8d0d437957b15252dfad775796a3949ed50dbcf
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 12 11:43:25 2011 -0400

    evergreen: Emit SQ_LDS_RESOURCE_MGMT
    
    Avoids rendering problems when compute changes this reg.
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=39119
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/evergreen_accel.c b/src/evergreen_accel.c
index 7cf3960..f4c70c7 100644
--- a/src/evergreen_accel.c
+++ b/src/evergreen_accel.c
@@ -1068,8 +1068,9 @@ evergreen_set_default_state(ScrnInfoPtr pScrn)
 
     evergreen_sq_setup(pScrn, &sq_conf);
 
-    BEGIN_BATCH(24);
+    BEGIN_BATCH(27);
     EREG(SQ_LDS_ALLOC_PS, 0);
+    EREG(SQ_LDS_RESOURCE_MGMT, 0x10001000);
     EREG(SQ_DYN_GPR_RESOURCE_LIMIT_1, 0);
 
     PACK0(SQ_ESGS_RING_ITEMSIZE, 6);
diff --git a/src/evergreen_reg.h b/src/evergreen_reg.h
index b08dbf9..96a243f 100644
--- a/src/evergreen_reg.h
+++ b/src/evergreen_reg.h
@@ -118,6 +118,7 @@ enum {
     SQ_LDS_ALLOC_PS                                       = 0x288ec,
     SQ_DYN_GPR_RESOURCE_LIMIT_1                           = 0x28838,
     SQ_DYN_GPR_CNTL_PS_FLUSH_REQ                          = 0x8d8c,
+    SQ_LDS_RESOURCE_MGMT				  = 0x8e2c,
 
     WAIT_UNTIL                                            = 0x8040,
 	WAIT_CP_DMA_IDLE_bit                              = 1 << 8,