Attachment 130399 Details for Bug 100304 – possible fix

[patch] possible fix

0001-drm-amdgpu-fix-KIQ-regression-s3-s4-issue.patch (text/plain), 1.73 KB, created by Alex Deucher on 2017-03-23 15:03:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2017-03-23 15:03:21 UTC

Size: 1.73 KB

patch

obsolete

>From 217c767d9ba17d2ae0d44857eb58dbf85eec9be7 Mon Sep 17 00:00:00 2001
>From: Rex Zhu <Rex.Zhu@amd.com>
>Date: Thu, 23 Mar 2017 16:19:49 +0800
>Subject: [PATCH] drm/amdgpu: fix KIQ regression s3/s4 issue.
>
>caused by commit 5d213940268bf65
>
>no need the function gfx_v8_0_cp_compute_fini
>and the mqd_obj should be freed in sw_fini.
>
>Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 24 ------------------------
> 1 file changed, 24 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
>index 76dc595..a023f27 100644
>--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
>@@ -4611,29 +4611,6 @@ static int gfx_v8_0_cp_compute_load_microcode(struct amdgpu_device *adev)
> 	return 0;
> }
> 
>-static void gfx_v8_0_cp_compute_fini(struct amdgpu_device *adev)
>-{
>-	int i, r;
>-
>-	for (i = 0; i < adev->gfx.num_compute_rings; i++) {
>-		struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];
>-
>-		if (ring->mqd_obj) {
>-			r = amdgpu_bo_reserve(ring->mqd_obj, false);
>-			if (unlikely(r != 0))
>-				dev_warn(adev->dev, "(%d) reserve MQD bo failed\n", r);
>-
>-			amdgpu_bo_unpin(ring->mqd_obj);
>-			amdgpu_bo_unreserve(ring->mqd_obj);
>-
>-			amdgpu_bo_unref(&ring->mqd_obj);
>-			ring->mqd_obj = NULL;
>-			ring->mqd_ptr = NULL;
>-			ring->mqd_gpu_addr = 0;
>-		}
>-	}
>-}
>-
> /* KIQ functions */
> static void gfx_v8_0_kiq_setting(struct amdgpu_ring *ring)
> {
>@@ -5103,7 +5080,6 @@ static int gfx_v8_0_hw_fini(void *handle)
> 	}
> 	gfx_v8_0_cp_enable(adev, false);
> 	gfx_v8_0_rlc_stop(adev);
>-	gfx_v8_0_cp_compute_fini(adev);
> 
> 	amdgpu_set_powergating_state(adev,
> 			AMD_IP_BLOCK_TYPE_GFX, AMD_PG_STATE_UNGATE);
>-- 
>2.5.5
>

Actions: View | Splinter Review

Attachments on bug 100304: 130353 | 130399

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.