diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0237-drm-amdgpu-fix-no-hdp-flush-for-compute-ring.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0237-drm-amdgpu-fix-no-hdp-flush-for-compute-ring.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0237-drm-amdgpu-fix-no-hdp-flush-for-compute-ring.patch b/common/recipes-kernel/linux/files/0237-drm-amdgpu-fix-no-hdp-flush-for-compute-ring.patch new file mode 100644 index 00000000..85e25b3c --- /dev/null +++ b/common/recipes-kernel/linux/files/0237-drm-amdgpu-fix-no-hdp-flush-for-compute-ring.patch @@ -0,0 +1,48 @@ +From d9b5327ad757164418e8d4e260a343377e99f205 Mon Sep 17 00:00:00 2001 +From: "monk.liu" <monk.liu@amd.com> +Date: Tue, 2 Jun 2015 15:50:33 +0800 +Subject: [PATCH 0237/1050] drm/amdgpu: fix no hdp flush for compute ring +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +No pfp on compute. + +Signed-off-by: monk.liu <monk.liu@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +index 58a20be..ed2f35d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +@@ -2376,6 +2376,7 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring) + static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) + { + u32 ref_and_mask; ++ int usepfp = ring->type == AMDGPU_RING_TYPE_COMPUTE ? 0 : 1; + + if (ring->type == AMDGPU_RING_TYPE_COMPUTE) { + switch (ring->me) { +@@ -2395,7 +2396,7 @@ static void gfx_v7_0_ring_emit_hdp_flush(struct amdgpu_ring *ring) + amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); + amdgpu_ring_write(ring, (WAIT_REG_MEM_OPERATION(1) | /* write, wait, write */ + WAIT_REG_MEM_FUNCTION(3) | /* == */ +- WAIT_REG_MEM_ENGINE(1))); /* pfp */ ++ WAIT_REG_MEM_ENGINE(usepfp))); /* pfp or me */ + amdgpu_ring_write(ring, mmGPU_HDP_FLUSH_REQ); + amdgpu_ring_write(ring, mmGPU_HDP_FLUSH_DONE); + amdgpu_ring_write(ring, ref_and_mask); +@@ -5522,6 +5523,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = { + .emit_semaphore = gfx_v7_0_ring_emit_semaphore, + .emit_vm_flush = gfx_v7_0_ring_emit_vm_flush, + .emit_gds_switch = gfx_v7_0_ring_emit_gds_switch, ++ .emit_hdp_flush = gfx_v7_0_ring_emit_hdp_flush, + .test_ring = gfx_v7_0_ring_test_ring, + .test_ib = gfx_v7_0_ring_test_ib, + .is_lockup = gfx_v7_0_ring_is_lockup, +-- +1.9.1 + |