diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0278-drm-amdgpu-send-SDMA-GFX-IB-tests-directly-to-the-ri.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0278-drm-amdgpu-send-SDMA-GFX-IB-tests-directly-to-the-ri.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0278-drm-amdgpu-send-SDMA-GFX-IB-tests-directly-to-the-ri.patch b/common/recipes-kernel/linux/files/0278-drm-amdgpu-send-SDMA-GFX-IB-tests-directly-to-the-ri.patch new file mode 100644 index 00000000..26c1ffb3 --- /dev/null +++ b/common/recipes-kernel/linux/files/0278-drm-amdgpu-send-SDMA-GFX-IB-tests-directly-to-the-ri.patch @@ -0,0 +1,111 @@ +From 11dcdc2e90be14d479c7052182c81d26eb67df69 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 1 Feb 2016 12:02:08 +0100 +Subject: [PATCH 0278/1110] drm/amdgpu: send SDMA/GFX IB tests directly to the + ring again +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is no point in sending them through the scheduler. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucer@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +--- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +--- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 8 ++------ + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +--- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +--- + 5 files changed, 6 insertions(+), 18 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +index 1309d3e..60c5d35 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c ++++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +@@ -633,9 +633,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring) + ib.ptr[3] = 1; + ib.ptr[4] = 0xDEADBEEF; + ib.length_dw = 5; +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) + goto err1; + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +index 0a2fb19..90bff8c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +@@ -2641,9 +2641,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring) + ib.ptr[2] = 0xDEADBEEF; + ib.length_dw = 3; + +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) + goto err2; + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +index 98d9186..ffc9b0a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -709,9 +709,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring) + ib.ptr[2] = 0xDEADBEEF; + ib.length_dw = 3; + +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) + goto err2; + +@@ -1266,9 +1264,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev) + ib.ptr[ib.length_dw++] = EVENT_TYPE(7) | EVENT_INDEX(4); + + /* shedule the ib on the ring */ +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) { + DRM_ERROR("amdgpu: ib submit failed (%d).\n", r); + goto fail; +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +index 32bb31a..9b29c2a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +@@ -691,9 +691,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring) + ib.ptr[7] = SDMA_PKT_HEADER_OP(SDMA_OP_NOP); + ib.length_dw = 8; + +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) + goto err1; + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +index fe18e85..17f9acd 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +@@ -842,9 +842,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring) + ib.ptr[7] = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP); + ib.length_dw = 8; + +- r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, +- AMDGPU_FENCE_OWNER_UNDEFINED, +- &f); ++ r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f); + if (r) + goto err1; + +-- +2.7.4 + |