1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index f4c4eea62526..1cf639a51178 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1918,6 +1918,15 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev)
         }
         soc15_grbm_select(adev, 0, 0, 0, 0);
         mutex_unlock(&adev->srbm_mutex);
+
+        /* Initialize all compute VMIDs to have no GDS, GWS, or OA
+           acccess. These should be enabled by FW for target VMIDs. */
+        for (i = FIRST_COMPUTE_VMID; i < LAST_COMPUTE_VMID; i++) {
+                WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_BASE, 2 * i, 0);
+                WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_SIZE, 2 * i, 0);
+                WREG32_SOC15_OFFSET(GC, 0, mmGDS_GWS_VMID0, i, 0);
+                WREG32_SOC15_OFFSET(GC, 0, mmGDS_OA_VMID0, i, 0);
+        }
 }
 
 static void gfx_v9_0_constants_init(struct amdgpu_device *adev)