Attachment 133132 Details for Bug 101946 – Brute-force fix, resets sdma every init

[patch] Brute-force fix, resets sdma every init

reset-sdma.patch (text/plain), 1.18 KB, created by Robin on 2017-07-29 22:22:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin

Created: 2017-07-29 22:22:17 UTC

Size: 1.18 KB

patch

obsolete

>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)

Actions: View | Splinter Review

Attachments on bug 101946: 133068 | 133069 | 133070 | 133074 | 133075 | 133098 | 133099 | 133100 | 133101 | 133103 | 133108 | 133127 | 133132 | 133172 | 133173

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.