diff options
author | Christian König <christian.koenig@amd.com> | 2018-03-01 05:01:52 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-05 15:37:12 -0500 |
commit | 57adc4cef617d7284ac7676e14533268e73e3699 (patch) | |
tree | 48f9789aa89591c04b96e4c2c2f663a51fc2aaad /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
parent | c396ef9bf3172fd57e86df4529b11d563f9ff801 (diff) |
drm/amdgpu: change amdgpu_ttm_set_active_vram_size
Instead of setting the active VRAM size directly provide a the info if
we can use the buffer functions or not.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Chunming zhou <david1.zhou@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 69568cd1bb99..f48ea0dad875 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -310,7 +310,7 @@ static void cik_sdma_gfx_stop(struct amdgpu_device *adev) | |||
310 | 310 | ||
311 | if ((adev->mman.buffer_funcs_ring == sdma0) || | 311 | if ((adev->mman.buffer_funcs_ring == sdma0) || |
312 | (adev->mman.buffer_funcs_ring == sdma1)) | 312 | (adev->mman.buffer_funcs_ring == sdma1)) |
313 | amdgpu_ttm_set_active_vram_size(adev, adev->gmc.visible_vram_size); | 313 | amdgpu_ttm_set_buffer_funcs_status(adev, false); |
314 | 314 | ||
315 | for (i = 0; i < adev->sdma.num_instances; i++) { | 315 | for (i = 0; i < adev->sdma.num_instances; i++) { |
316 | rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]); | 316 | rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]); |
@@ -510,7 +510,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev) | |||
510 | } | 510 | } |
511 | 511 | ||
512 | if (adev->mman.buffer_funcs_ring == ring) | 512 | if (adev->mman.buffer_funcs_ring == ring) |
513 | amdgpu_ttm_set_active_vram_size(adev, adev->gmc.real_vram_size); | 513 | amdgpu_ttm_set_buffer_funcs_status(adev, true); |
514 | } | 514 | } |
515 | 515 | ||
516 | return 0; | 516 | return 0; |