diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 20 | 
1 files changed, 8 insertions, 12 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 154b1499b07e..ee9d5c92edb1 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -1370,10 +1370,8 @@ static const struct amdgpu_buffer_funcs cik_sdma_buffer_funcs = {  static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev)  { -	if (adev->mman.buffer_funcs == NULL) { -		adev->mman.buffer_funcs = &cik_sdma_buffer_funcs; -		adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; -	} +	adev->mman.buffer_funcs = &cik_sdma_buffer_funcs; +	adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;  }  static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = { @@ -1389,15 +1387,13 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)  	struct drm_gpu_scheduler *sched;  	unsigned i; -	if (adev->vm_manager.vm_pte_funcs == NULL) { -		adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs; -		for (i = 0; i < adev->sdma.num_instances; i++) { -			sched = &adev->sdma.instance[i].ring.sched; -			adev->vm_manager.vm_pte_rqs[i] = -				&sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL]; -		} -		adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances; +	adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs; +	for (i = 0; i < adev->sdma.num_instances; i++) { +		sched = &adev->sdma.instance[i].ring.sched; +		adev->vm_manager.vm_pte_rqs[i] = +			&sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];  	} +	adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;  }  const struct amdgpu_ip_block_version cik_sdma_ip_block = | 
