diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index f508f4d01e4a..9953810eded9 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -1027,16 +1027,36 @@ static int cik_sdma_sw_fini(void *handle)
 	return 0;
 }
 
+static int cik_sdma_force_soft_reset(void *handle)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	u32 srbm_soft_reset = SRBM_SOFT_RESET__SOFT_RESET_SDMA_MASK | SRBM_SOFT_RESET__SOFT_RESET_SDMA1_MASK;
+	u32 tmp = RREG32(mmSRBM_SOFT_RESET);
+
+	tmp |= srbm_soft_reset;
+	dev_info(adev->dev, "SRBM_SOFT_RESET=0x%08X\n", tmp);
+	WREG32(mmSRBM_SOFT_RESET, tmp);
+	tmp = RREG32(mmSRBM_SOFT_RESET);
+
+	udelay(50);
+
+	tmp &= ~srbm_soft_reset;
+	WREG32(mmSRBM_SOFT_RESET, tmp);
+	tmp = RREG32(mmSRBM_SOFT_RESET);
+
+	/* Wait a little for things to settle down */
+	udelay(50);
+
+	return 0;
+}
+
 static int cik_sdma_hw_init(void *handle)
 {
-	int r;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-	r = cik_sdma_start(adev);
-	if (r)
-		return r;
+	cik_sdma_force_soft_reset(adev);
 
-	return r;
+	return cik_sdma_start(adev);
 }
 
 static int cik_sdma_hw_fini(void *handle)