summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-12-20 21:19:32 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 08:50:50 -0800
commite4a5d6d17f6dff0174ba1c0b2041d73ec7d0c1dd (patch)
treee8f7a7870db284233bfa1f8289b0ee164912f60a /drivers
parenta98843e161b490b91fac1b7e0daa4ba9517bf65a (diff)
downloadkernel-common-e4a5d6d17f6dff0174ba1c0b2041d73ec7d0c1dd.tar.gz
kernel-common-e4a5d6d17f6dff0174ba1c0b2041d73ec7d0c1dd.tar.bz2
kernel-common-e4a5d6d17f6dff0174ba1c0b2041d73ec7d0c1dd.zip
drm/radeon: add WAIT_UNTIL to evergreen VM safe reg list
commit 668bbc81baf0f34df832d8aca5c7d5e19a493c68 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/evergreen_cs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 22c84bcfaebf..2cbd369e0fcb 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -2670,6 +2670,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: