diff options
author | Christian König <christian.koenig@amd.com> | 2018-01-12 08:52:22 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:17:43 -0500 |
commit | 770d13b19fdf365a99e559f1d47f1380910a947d (patch) | |
tree | d9c9e2f506facd092fb3c85663d6d08fb1bf50a7 /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
parent | da320625de81f508bbe658d57bfa015ff8894de2 (diff) |
drm/amdgpu: move struct amdgpu_mc into amdgpu_gmc.h
And rename it to amdgpu_gmc as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Samuel Li <Samuel.Li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 6e8278e689b1..1836ae1b7505 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -317,7 +317,7 @@ static void cik_sdma_gfx_stop(struct amdgpu_device *adev) | |||
317 | 317 | ||
318 | if ((adev->mman.buffer_funcs_ring == sdma0) || | 318 | if ((adev->mman.buffer_funcs_ring == sdma0) || |
319 | (adev->mman.buffer_funcs_ring == sdma1)) | 319 | (adev->mman.buffer_funcs_ring == sdma1)) |
320 | amdgpu_ttm_set_active_vram_size(adev, adev->mc.visible_vram_size); | 320 | amdgpu_ttm_set_active_vram_size(adev, adev->gmc.visible_vram_size); |
321 | 321 | ||
322 | for (i = 0; i < adev->sdma.num_instances; i++) { | 322 | for (i = 0; i < adev->sdma.num_instances; i++) { |
323 | rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]); | 323 | rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]); |
@@ -517,7 +517,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev) | |||
517 | } | 517 | } |
518 | 518 | ||
519 | if (adev->mman.buffer_funcs_ring == ring) | 519 | if (adev->mman.buffer_funcs_ring == ring) |
520 | amdgpu_ttm_set_active_vram_size(adev, adev->mc.real_vram_size); | 520 | amdgpu_ttm_set_active_vram_size(adev, adev->gmc.real_vram_size); |
521 | } | 521 | } |
522 | 522 | ||
523 | return 0; | 523 | return 0; |