Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: consistently use AMDGPU_CSA_VADDR

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
97745f68 a3e9a15a

+7 -7
+5 -5
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
··· 7132 7132 } ce_payload = {}; 7133 7133 7134 7134 if (ring->adev->virt.chained_ib_support) { 7135 - ce_payload_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096 + 7136 - offsetof(struct vi_gfx_meta_data_chained_ib, ce_payload); 7135 + ce_payload_addr = AMDGPU_CSA_VADDR + 7136 + offsetof(struct vi_gfx_meta_data_chained_ib, ce_payload); 7137 7137 cnt_ce = (sizeof(ce_payload.chained) >> 2) + 4 - 2; 7138 7138 } else { 7139 - ce_payload_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096 + 7140 - offsetof(struct vi_gfx_meta_data, ce_payload); 7139 + ce_payload_addr = AMDGPU_CSA_VADDR + 7140 + offsetof(struct vi_gfx_meta_data, ce_payload); 7141 7141 cnt_ce = (sizeof(ce_payload.regular) >> 2) + 4 - 2; 7142 7142 } 7143 7143 ··· 7160 7160 struct vi_de_ib_state_chained_ib chained; 7161 7161 } de_payload = {}; 7162 7162 7163 - csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; 7163 + csa_addr = AMDGPU_CSA_VADDR; 7164 7164 gds_addr = csa_addr + 4096; 7165 7165 if (ring->adev->virt.chained_ib_support) { 7166 7166 de_payload.chained.gds_backup_addrlo = lower_32_bits(gds_addr);
+2 -2
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
··· 3865 3865 int cnt; 3866 3866 3867 3867 cnt = (sizeof(ce_payload) >> 2) + 4 - 2; 3868 - csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; 3868 + csa_addr = AMDGPU_CSA_VADDR; 3869 3869 3870 3870 amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, cnt)); 3871 3871 amdgpu_ring_write(ring, (WRITE_DATA_ENGINE_SEL(2) | ··· 3883 3883 uint64_t csa_addr, gds_addr; 3884 3884 int cnt; 3885 3885 3886 - csa_addr = AMDGPU_VA_RESERVED_SIZE - 2 * 4096; 3886 + csa_addr = AMDGPU_CSA_VADDR; 3887 3887 gds_addr = csa_addr + 4096; 3888 3888 de_payload.gds_backup_addrlo = lower_32_bits(gds_addr); 3889 3889 de_payload.gds_backup_addrhi = upper_32_bits(gds_addr);