tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu: move sched status check inside amdgpu_ttm_set_buffer_funcs_status

It avoids duplicated code and allows to output a warning.

---
v4: move check inside the existing if (enable) test
---

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Pierre-Eric Pelloux-Prayer and committed by
Alex Deucher 79a0ff59 e3dc7976

+9 -9
+4 -9
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 3156 3156 if (r) 3157 3157 goto init_failed; 3158 3158 3159 - if (adev->mman.buffer_funcs_ring && 3160 - adev->mman.buffer_funcs_ring->sched.ready) 3161 - amdgpu_ttm_set_buffer_funcs_status(adev, true); 3159 + amdgpu_ttm_set_buffer_funcs_status(adev, true); 3162 3160 3163 3161 /* Don't init kfd if whole hive need to be reset during init */ 3164 3162 if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) { ··· 4045 4047 4046 4048 r = amdgpu_device_ip_resume_phase2(adev); 4047 4049 4048 - if (adev->mman.buffer_funcs_ring->sched.ready) 4049 - amdgpu_ttm_set_buffer_funcs_status(adev, true); 4050 + amdgpu_ttm_set_buffer_funcs_status(adev, true); 4050 4051 4051 4052 if (r) 4052 4053 return r; ··· 5192 5195 return 0; 5193 5196 5194 5197 unwind_evict: 5195 - if (adev->mman.buffer_funcs_ring->sched.ready) 5196 - amdgpu_ttm_set_buffer_funcs_status(adev, true); 5198 + amdgpu_ttm_set_buffer_funcs_status(adev, true); 5197 5199 amdgpu_fence_driver_hw_init(adev); 5198 5200 5199 5201 unwind_userq: ··· 5926 5930 if (r) 5927 5931 goto out; 5928 5932 5929 - if (tmp_adev->mman.buffer_funcs_ring->sched.ready) 5930 - amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); 5933 + amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); 5931 5934 5932 5935 r = amdgpu_device_ip_resume_phase3(tmp_adev); 5933 5936 if (r)
+5
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 2356 2356 struct amdgpu_ring *ring; 2357 2357 struct drm_gpu_scheduler *sched; 2358 2358 2359 + if (!adev->mman.buffer_funcs_ring || !adev->mman.buffer_funcs_ring->sched.ready) { 2360 + dev_warn(adev->dev, "Not enabling DMA transfers for in kernel use"); 2361 + return; 2362 + } 2363 + 2359 2364 ring = adev->mman.buffer_funcs_ring; 2360 2365 sched = &ring->sched; 2361 2366 r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,