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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d9789e0b52015b2791a41181fb5512631cb2ff1a..9a051c84f50d86720480da02ec6aa8f2c3baedde 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3156,9 +3156,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
        if (r)
                goto init_failed;
 
-       if (adev->mman.buffer_funcs_ring &&
-           adev->mman.buffer_funcs_ring->sched.ready)
-               amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_set_buffer_funcs_status(adev, true);
 
        /* Don't init kfd if whole hive need to be reset during init */
        if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) {
@@ -4047,8 +4045,7 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev)
 
        r = amdgpu_device_ip_resume_phase2(adev);
 
-       if (adev->mman.buffer_funcs_ring->sched.ready)
-               amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_set_buffer_funcs_status(adev, true);
 
        if (r)
                return r;
@@ -5195,8 +5192,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
        return 0;
 
 unwind_evict:
-       if (adev->mman.buffer_funcs_ring->sched.ready)
-               amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_set_buffer_funcs_status(adev, true);
        amdgpu_fence_driver_hw_init(adev);
 
 unwind_userq:
@@ -5930,8 +5926,7 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_reset_context *reset_context)
                                if (r)
                                        goto out;
 
-                               if (tmp_adev->mman.buffer_funcs_ring->sched.ready)
-                                       amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true);
+                               amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true);
 
                                r = amdgpu_device_ip_resume_phase3(tmp_adev);
                                if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 17121cdc76b72a7d075d7ef486df1c682ce540a0..6e635d4c7d590cd4db4276cd46a56bb4fa4f6e4a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2356,6 +2356,11 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
                struct amdgpu_ring *ring;
                struct drm_gpu_scheduler *sched;
 
+               if (!adev->mman.buffer_funcs_ring || !adev->mman.buffer_funcs_ring->sched.ready) {
+                       dev_warn(adev->dev, "Not enabling DMA transfers for in kernel use");
+                       return;
+               }
+
                ring = adev->mman.buffer_funcs_ring;
                sched = &ring->sched;
                r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,