diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3246-drm-amdgpu-consistently-use-AMDGPU_CSA_VADDR.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3246-drm-amdgpu-consistently-use-AMDGPU_CSA_VADDR.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3246-drm-amdgpu-consistently-use-AMDGPU_CSA_VADDR.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3246-drm-amdgpu-consistently-use-AMDGPU_CSA_VADDR.patch new file mode 100644 index 00000000..764760ce --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3246-drm-amdgpu-consistently-use-AMDGPU_CSA_VADDR.patch @@ -0,0 +1,73 @@ +From fad636f54c1aa813e2afea943642db9dc6c89155 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 23 Jan 2018 10:03:46 +0100 +Subject: [PATCH 3246/4131] drm/amdgpu: consistently use AMDGPU_CSA_VADDR +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Instead of repeating this multiple times. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Acked-by: Monk Liu <monk.liu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 10 +++++----- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +index 21b30b9..2d3cd6a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -7145,12 +7145,12 @@ static void gfx_v8_0_ring_emit_ce_meta(struct amdgpu_ring *ring) + } ce_payload = {}; + + if (ring->adev->virt.chained_ib_support) { +- ce_payload_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096 + +- offsetof(struct vi_gfx_meta_data_chained_ib, ce_payload); ++ ce_payload_addr = AMDGPU_CSA_VADDR + ++ offsetof(struct vi_gfx_meta_data_chained_ib, ce_payload); + cnt_ce = (sizeof(ce_payload.chained) >> 2) + 4 - 2; + } else { +- ce_payload_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096 + +- offsetof(struct vi_gfx_meta_data, ce_payload); ++ ce_payload_addr = AMDGPU_CSA_VADDR + ++ offsetof(struct vi_gfx_meta_data, ce_payload); + cnt_ce = (sizeof(ce_payload.regular) >> 2) + 4 - 2; + } + +@@ -7173,7 +7173,7 @@ static void gfx_v8_0_ring_emit_de_meta(struct amdgpu_ring *ring) + struct vi_de_ib_state_chained_ib chained; + } de_payload = {}; + +- csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; ++ csa_addr = AMDGPU_CSA_VADDR; + gds_addr = csa_addr + 4096; + if (ring->adev->virt.chained_ib_support) { + de_payload.chained.gds_backup_addrlo = lower_32_bits(gds_addr); +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +index 9c4544d..c0c6629 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -3871,7 +3871,7 @@ static void gfx_v9_0_ring_emit_ce_meta(struct amdgpu_ring *ring) + int cnt; + + cnt = (sizeof(ce_payload) >> 2) + 4 - 2; +- csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; ++ csa_addr = AMDGPU_CSA_VADDR; + + amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, cnt)); + amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(2) | +@@ -3889,7 +3889,7 @@ static void gfx_v9_0_ring_emit_de_meta(struct amdgpu_ring *ring) + uint64_t csa_addr, gds_addr; + int cnt; + +- csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; ++ csa_addr = AMDGPU_CSA_VADDR; + gds_addr = csa_addr + 4096; + de_payload.gds_backup_addrlo = lower_32_bits(gds_addr); + de_payload.gds_backup_addrhi = upper_32_bits(gds_addr); +-- +2.7.4 + |