diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0202-drm-amdgpu-Change-kiq-ring-initialize-sequence-on-gf.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0202-drm-amdgpu-Change-kiq-ring-initialize-sequence-on-gf.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0202-drm-amdgpu-Change-kiq-ring-initialize-sequence-on-gf.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0202-drm-amdgpu-Change-kiq-ring-initialize-sequence-on-gf.patch new file mode 100644 index 00000000..b8ddf14a --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0202-drm-amdgpu-Change-kiq-ring-initialize-sequence-on-gf.patch @@ -0,0 +1,98 @@ +From 45ca1d9ea89cf629664879bf1a0f6ab49a6f398b Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Wed, 22 Aug 2018 18:54:45 +0800 +Subject: [PATCH 0202/2940] drm/amdgpu: Change kiq ring initialize sequence on + gfx9 + +1. initialize kiq before initialize gfx ring. +2. set kiq ring ready immediately when kiq initialize + successfully. +3. split function gfx_v9_0_kiq_resume into two functions. + gfx_v9_0_kiq_resume is for kiq initialize. + gfx_v9_0_kcq_resume is for kcq initialize. + +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 38 +++++++++++++++++---------- + 1 file changed, 24 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index 190bc120ec7f..78666f71b056 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -2688,7 +2688,6 @@ static int gfx_v9_0_kiq_kcq_enable(struct amdgpu_device *adev) + queue_mask |= (1ull << i); + } + +- kiq_ring->ready = true; + r = amdgpu_ring_alloc(kiq_ring, (7 * adev->gfx.num_compute_rings) + 8); + if (r) { + DRM_ERROR("Failed to lock KIQ (%d).\n", r); +@@ -3095,26 +3094,33 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring) + + static int gfx_v9_0_kiq_resume(struct amdgpu_device *adev) + { +- struct amdgpu_ring *ring = NULL; +- int r = 0, i; +- +- gfx_v9_0_cp_compute_enable(adev, true); ++ struct amdgpu_ring *ring; ++ int r; + + ring = &adev->gfx.kiq.ring; + + r = amdgpu_bo_reserve(ring->mqd_obj, false); + if (unlikely(r != 0)) +- goto done; ++ return r; + + r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr); +- if (!r) { +- r = gfx_v9_0_kiq_init_queue(ring); +- amdgpu_bo_kunmap(ring->mqd_obj); +- ring->mqd_ptr = NULL; +- } ++ if (unlikely(r != 0)) ++ return r; ++ ++ gfx_v9_0_kiq_init_queue(ring); ++ amdgpu_bo_kunmap(ring->mqd_obj); ++ ring->mqd_ptr = NULL; + amdgpu_bo_unreserve(ring->mqd_obj); +- if (r) +- goto done; ++ ring->ready = true; ++ return 0; ++} ++ ++static int gfx_v9_0_kcq_resume(struct amdgpu_device *adev) ++{ ++ struct amdgpu_ring *ring = NULL; ++ int r = 0, i; ++ ++ gfx_v9_0_cp_compute_enable(adev, true); + + for (i = 0; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +@@ -3157,11 +3163,15 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) + return r; + } + ++ r = gfx_v9_0_kiq_resume(adev); ++ if (r) ++ return r; ++ + r = gfx_v9_0_cp_gfx_resume(adev); + if (r) + return r; + +- r = gfx_v9_0_kiq_resume(adev); ++ r = gfx_v9_0_kcq_resume(adev); + if (r) + return r; + +-- +2.17.1 + |