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

drm/amdgpu: setup the shared and private apertures on gfx9

Same as previous asics. This was not yet set for gfx9.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+20 -5
+12 -5
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
··· 1529 1529 for (i = 0; i < 16; i++) { 1530 1530 soc15_grbm_select(adev, 0, 0, 0, i); 1531 1531 /* CP and shaders */ 1532 - tmp = 0; 1533 - tmp = REG_SET_FIELD(tmp, SH_MEM_CONFIG, ALIGNMENT_MODE, 1534 - SH_MEM_ALIGNMENT_MODE_UNALIGNED); 1535 - WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp); 1536 - WREG32_SOC15(GC, 0, mmSH_MEM_BASES, 0); 1532 + if (i == 0) { 1533 + tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE, 1534 + SH_MEM_ALIGNMENT_MODE_UNALIGNED); 1535 + WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp); 1536 + WREG32_SOC15(GC, 0, mmSH_MEM_BASES, 0); 1537 + } else { 1538 + tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE, 1539 + SH_MEM_ALIGNMENT_MODE_UNALIGNED); 1540 + WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp); 1541 + tmp = adev->mc.shared_aperture_start >> 48; 1542 + WREG32_SOC15(GC, 0, mmSH_MEM_BASES, tmp); 1543 + } 1537 1544 } 1538 1545 soc15_grbm_select(adev, 0, 0, 0, 0); 1539 1546
+8
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 499 499 gmc_v9_0_set_gart_funcs(adev); 500 500 gmc_v9_0_set_irq_funcs(adev); 501 501 502 + adev->mc.shared_aperture_start = 0x2000000000000000ULL; 503 + adev->mc.shared_aperture_end = 504 + adev->mc.shared_aperture_start + (4ULL << 30) - 1; 505 + adev->mc.private_aperture_start = 506 + adev->mc.shared_aperture_end + 1; 507 + adev->mc.private_aperture_end = 508 + adev->mc.private_aperture_start + (4ULL << 30) - 1; 509 + 502 510 return 0; 503 511 } 504 512