radeon: *really* fix screen corruption thanks to Lukasz Krotowski

diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
index eac15b0..cdb35d2 100644 (file)
--- a/shared-core/r300_cmdbuf.c
+++ b/shared-core/r300_cmdbuf.c
@@ -980,7 +980,6 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
        struct drm_buf *buf = NULL;
        int emit_dispatch_age = 0;
        int ret = 0;
-       RING_LOCALS;
 
        DRM_DEBUG("\n");
 

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index ec914df..9b1ea85 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -442,7 +442,7 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv)
        OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));
        OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D |
                 RADEON_ISYNC_ANY3D_IDLE2D |
-                RADEON_ISYNC_CPSCRATCH_IDLEGUI |
+                RADEON_ISYNC_WAIT_IDLEGUI |
                 RADEON_ISYNC_CPSCRATCH_IDLEGUI);
        RADEON_PURGE_CACHE();
        RADEON_PURGE_ZCACHE();