diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/1091-drm-amdgpu-fix-staging-4.5-merge-error-for-pipeline-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/1091-drm-amdgpu-fix-staging-4.5-merge-error-for-pipeline-.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/common/recipes-kernel/linux/files/1091-drm-amdgpu-fix-staging-4.5-merge-error-for-pipeline-.patch b/common/recipes-kernel/linux/files/1091-drm-amdgpu-fix-staging-4.5-merge-error-for-pipeline-.patch deleted file mode 100644 index 948eb4ce..00000000 --- a/common/recipes-kernel/linux/files/1091-drm-amdgpu-fix-staging-4.5-merge-error-for-pipeline-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 66212c639e2fdff02ffdbade2de52602bb8e2be7 Mon Sep 17 00:00:00 2001 -From: Chunming Zhou <David1.Zhou@amd.com> -Date: Mon, 9 May 2016 17:29:39 +0800 -Subject: [PATCH 1091/1110] drm/amdgpu: fix staging-4.5 merge error for - pipeline sync - -Change-Id: I5b30a455a2c0b03cb16dcfc6ae03e6430a97745c -Signed-off-by: Chunming Zhou <David1.Zhou@amd.com> -Reviewed-by: Monk Liu <monk.liu@amd.com> -Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -index b449a40..356a389 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -@@ -3052,6 +3052,19 @@ static int gfx_v7_0_cp_resume(struct amdgpu_device *adev) - static void gfx_v7_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) - { - int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); -+ uint32_t seq = ring->fence_drv.sync_seq; -+ uint64_t addr = ring->fence_drv.gpu_addr; -+ -+ amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); -+ amdgpu_ring_write(ring, (WAIT_REG_MEM_MEM_SPACE(1) | /* memory */ -+ WAIT_REG_MEM_FUNCTION(3) | /* equal */ -+ WAIT_REG_MEM_ENGINE(usepfp))); /* pfp or me */ -+ amdgpu_ring_write(ring, addr & 0xfffffffc); -+ amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); -+ amdgpu_ring_write(ring, seq); -+ amdgpu_ring_write(ring, 0xffffffff); -+ amdgpu_ring_write(ring, 4); /* poll interval */ -+ - if (usepfp) { - /* synce CE with ME to prevent CE fetch CEIB before context switch done */ - amdgpu_ring_write(ring, PACKET3(PACKET3_SWITCH_BUFFER, 0)); -@@ -3079,18 +3092,6 @@ static void gfx_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, - unsigned vm_id, uint64_t pd_addr) - { - int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX); -- uint32_t seq = ring->fence_drv.sync_seq[ring->idx]; -- uint64_t addr = ring->fence_drv.gpu_addr; -- -- amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); -- amdgpu_ring_write(ring, (WAIT_REG_MEM_MEM_SPACE(1) | /* memory */ -- WAIT_REG_MEM_FUNCTION(3) | /* equal */ -- WAIT_REG_MEM_ENGINE(usepfp))); /* pfp or me */ -- amdgpu_ring_write(ring, addr & 0xfffffffc); -- amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); -- amdgpu_ring_write(ring, seq); -- amdgpu_ring_write(ring, 0xffffffff); -- amdgpu_ring_write(ring, 4); /* poll interval */ - - amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); - amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) | --- -2.7.4 - |