summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
diff options
context:
space:
mode:
authorFlora Cui2018-04-18 11:12:19 +0200
committerAlex Deucher2018-05-15 20:43:33 +0200
commitbfa8eea29b12e403b391820b7ef5cf5c77ab0afe (patch)
tree907cea3970e5a1e4d844048695987fbcee5bd099 /drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
parentdrm/amd/pp: Fix NULL point check error in smu_set_watermarks_for_clocks_ranges (diff)
downloadkernel-qcow2-linux-bfa8eea29b12e403b391820b7ef5cf5c77ab0afe.tar.gz
kernel-qcow2-linux-bfa8eea29b12e403b391820b7ef5cf5c77ab0afe.tar.xz
kernel-qcow2-linux-bfa8eea29b12e403b391820b7ef5cf5c77ab0afe.zip
drm/amdgpu: init gfx9 aperture settings
fix settings. Signed-off-by: Flora Cui <Flora.Cui@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 05b2d34110b7..587a8731fa31 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1617,7 +1617,10 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)
tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE,
SH_MEM_ALIGNMENT_MODE_UNALIGNED);
WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp);
- tmp = adev->gmc.shared_aperture_start >> 48;
+ tmp = REG_SET_FIELD(0, SH_MEM_BASES, PRIVATE_BASE,
+ (adev->gmc.private_aperture_start >> 48));
+ tmp = REG_SET_FIELD(tmp, SH_MEM_BASES, SHARED_BASE,
+ (adev->gmc.shared_aperture_start >> 48));
WREG32_SOC15(GC, 0, mmSH_MEM_BASES, tmp);
}
}