From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 21 Dec 2012 02:19:32 +0000 (-0500)
Subject: drm/radeon: add WAIT_UNTIL to evergreen VM safe reg list
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=668bbc81baf0f34df832d8aca5c7d5e19a493c68;p=linux-beck.git

drm/radeon: add WAIT_UNTIL to evergreen VM safe reg list

It's used in a recent mesa commit:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=24b1206ab2dcd506aaac3ef656aebc8bc20cd27a
and there may be some other cases in the future where it's required.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Cc: stable@vger.kernel.org
---

diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 5cea852237ee..7a445666e71f 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -3316,6 +3316,7 @@ static bool evergreen_vm_reg_valid(u32 reg)
 
 	/* check config regs */
 	switch (reg) {
+	case WAIT_UNTIL:
 	case GRBM_GFX_INDEX:
 	case CP_STRMOUT_CNTL:
 	case CP_COHER_CNTL: