diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2174-drm-amdgpu-create-mqd-for-gfx-queues-on-navi10.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2174-drm-amdgpu-create-mqd-for-gfx-queues-on-navi10.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2174-drm-amdgpu-create-mqd-for-gfx-queues-on-navi10.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2174-drm-amdgpu-create-mqd-for-gfx-queues-on-navi10.patch new file mode 100644 index 00000000..54547aff --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2174-drm-amdgpu-create-mqd-for-gfx-queues-on-navi10.patch @@ -0,0 +1,84 @@ +From 350fbcc51bd3b92cc417f7a48efb5e9aee16c448 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Tue, 14 Aug 2018 20:54:35 +0800 +Subject: [PATCH 2174/2940] drm/amdgpu: create mqd for gfx queues on navi10 + +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Jack Xiao <jack.xiao@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Acked-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 35 ++++++++++++++++++++++++- + 1 file changed, 34 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +index 0b595b63520b..8c2b8543d7bd 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +@@ -389,6 +389,27 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, + dev_warn(adev->dev, "no memory to create MQD backup for ring %s\n", ring->name); + } + ++ if (adev->asic_type == CHIP_NAVI10 && amdgpu_async_gfx_ring) { ++ /* create MQD for each KGQ */ ++ for (i = 0; i < adev->gfx.num_gfx_rings; i++) { ++ ring = &adev->gfx.gfx_ring[i]; ++ if (!ring->mqd_obj) { ++ r = amdgpu_bo_create_kernel(adev, mqd_size, PAGE_SIZE, ++ AMDGPU_GEM_DOMAIN_GTT, &ring->mqd_obj, ++ &ring->mqd_gpu_addr, &ring->mqd_ptr); ++ if (r) { ++ dev_warn(adev->dev, "failed to create ring mqd bo (%d)", r); ++ return r; ++ } ++ ++ /* prepare MQD backup */ ++ adev->gfx.me.mqd_backup[i] = kmalloc(mqd_size, GFP_KERNEL); ++ if (!adev->gfx.me.mqd_backup[i]) ++ dev_warn(adev->dev, "no memory to create MQD backup for ring %s\n", ring->name); ++ } ++ } ++ } ++ + /* create MQD for each KCQ */ + for (i = 0; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; +@@ -397,7 +418,7 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, + AMDGPU_GEM_DOMAIN_GTT, &ring->mqd_obj, + &ring->mqd_gpu_addr, &ring->mqd_ptr); + if (r) { +- dev_warn(adev->dev, "failed to create ring mqd ob (%d)", r); ++ dev_warn(adev->dev, "failed to create ring mqd bo (%d)", r); + return r; + } + +@@ -416,6 +437,16 @@ void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev) + struct amdgpu_ring *ring = NULL; + int i; + ++ if (adev->asic_type == CHIP_NAVI10 && amdgpu_async_gfx_ring) { ++ for (i = 0; i < adev->gfx.num_gfx_rings; i++) { ++ ring = &adev->gfx.gfx_ring[i]; ++ kfree(adev->gfx.me.mqd_backup[i]); ++ amdgpu_bo_free_kernel(&ring->mqd_obj, ++ &ring->mqd_gpu_addr, ++ &ring->mqd_ptr); ++ } ++ } ++ + for (i = 0; i < adev->gfx.num_compute_rings; i++) { + ring = &adev->gfx.compute_ring[i]; + kfree(adev->gfx.mec.mqd_backup[i]); +@@ -425,6 +456,8 @@ void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev) + } + + ring = &adev->gfx.kiq.ring; ++ if (adev->asic_type == CHIP_NAVI10 && amdgpu_async_gfx_ring) ++ kfree(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS]); + kfree(adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS]); + amdgpu_bo_free_kernel(&ring->mqd_obj, + &ring->mqd_gpu_addr, +-- +2.17.1 + |