summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-06-02 16:30:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-21 07:00:10 +0200
commitda3538c85910f7be46be7cff083dc8b615b038ad (patch)
tree245519c38fb888e50d0e2c87dae00ac221a3e0d9
parentfc0a2569a0ae9af51da2632715d84be7ec97df7c (diff)
downloadlinux-da3538c85910f7be46be7cff083dc8b615b038ad.tar.gz
linux-da3538c85910f7be46be7cff083dc8b615b038ad.tar.bz2
linux-da3538c85910f7be46be7cff083dc8b615b038ad.zip
drm/amdgpu/gfx6: properly cache mc_arb_ramcfg
commit 6653ebd48f493efe3f3598ff3fe7b3d5451665df upstream. This was missing for gfx6. Acked-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 2086e7e68de4..116ea4bb31cd 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1685,7 +1685,8 @@ static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)
WREG32(mmBIF_FB_EN, BIF_FB_EN__FB_READ_EN_MASK | BIF_FB_EN__FB_WRITE_EN_MASK);
mc_shared_chmap = RREG32(mmMC_SHARED_CHMAP);
- mc_arb_ramcfg = RREG32(mmMC_ARB_RAMCFG);
+ adev->gfx.config.mc_arb_ramcfg = RREG32(mmMC_ARB_RAMCFG);
+ mc_arb_ramcfg = adev->gfx.config.mc_arb_ramcfg;
adev->gfx.config.num_tile_pipes = adev->gfx.config.max_tile_pipes;
adev->gfx.config.mem_max_burst_length_bytes = 256;