diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1630-drm-amdgpu-free-up-the-first-paging-queue-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1630-drm-amdgpu-free-up-the-first-paging-queue-v2.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1630-drm-amdgpu-free-up-the-first-paging-queue-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1630-drm-amdgpu-free-up-the-first-paging-queue-v2.patch new file mode 100644 index 00000000..7bec1eb6 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1630-drm-amdgpu-free-up-the-first-paging-queue-v2.patch @@ -0,0 +1,64 @@ +From 24171fab4cdf1f51957b70927ca0d4174755e7ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Wed, 5 Dec 2018 14:24:21 +0100 +Subject: [PATCH 1630/2940] drm/amdgpu: free up the first paging queue v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need the first paging queue to handle page faults. + +v2: handle any number of SDMA instances gracefully + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 19b30127c53d..59ba47dc5692 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -2265,8 +2265,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = { + static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev) + { + adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs; +- if (adev->sdma.has_page_queue) +- adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page; ++ if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) ++ adev->mman.buffer_funcs_ring = &adev->sdma.instance[1].page; + else + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; + } +@@ -2285,15 +2285,21 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev) + unsigned i; + + adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs; +- for (i = 0; i < adev->sdma.num_instances; i++) { +- if (adev->sdma.has_page_queue) ++ if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) { ++ for (i = 1; i < adev->sdma.num_instances; i++) { + sched = &adev->sdma.instance[i].page.sched; +- else ++ adev->vm_manager.vm_pte_rqs[i - 1] = ++ &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL]; ++ } ++ adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances - 1; ++ } else { ++ for (i = 0; i < adev->sdma.num_instances; i++) { + sched = &adev->sdma.instance[i].ring.sched; +- adev->vm_manager.vm_pte_rqs[i] = +- &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL]; ++ adev->vm_manager.vm_pte_rqs[i] = ++ &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL]; ++ } ++ adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances; + } +- adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances; + } + + const struct amdgpu_ip_block_version sdma_v4_0_ip_block = { +-- +2.17.1 + |