Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 5f401b41ef7c..751567f78567 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -3706,6 +3706,15 @@ static void gfx_v8_0_init_compute_vmid(struct amdgpu_device *adev)
         }
         vi_srbm_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(amdgpu_gds_reg_offset[i].mem_base, 0);
+                WREG32(amdgpu_gds_reg_offset[i].mem_size, 0);
+                WREG32(amdgpu_gds_reg_offset[i].gws, 0);
+                WREG32(amdgpu_gds_reg_offset[i].oa, 0);
+        }
 }
 
 static void gfx_v8_0_config_init(struct amdgpu_device *adev)