drm/amdgpu: split amdgpu_ttm_set_buffer_funcs_status in 2 funcs

Makes a code slightly clearer and reduces indentation.

---
v5: use amdgpu_in_reset in amdgpu_ttm_disable_buffer_funcs
---

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Suggested-by: Christian König <christian.koenig@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 86ba5aa39462efdabdc2582279136818a568a774..656f75b7325d95fd2c69382d8a31ddd504205df2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2463,7 +2463,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
        if (r)
                goto init_failed;
 
-       amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_enable_buffer_funcs(adev);
 
        /* Don't init kfd if whole hive need to be reset during init */
        if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) {
@@ -3147,7 +3147,7 @@ static int amdgpu_device_ip_suspend(struct amdgpu_device *adev)
                amdgpu_virt_request_full_gpu(adev, false);
        }
 
-       amdgpu_ttm_set_buffer_funcs_status(adev, false);
+       amdgpu_ttm_disable_buffer_funcs(adev);
 
        r = amdgpu_device_ip_suspend_phase1(adev);
        if (r)
@@ -3362,7 +3362,7 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev)
 
        r = amdgpu_device_ip_resume_phase2(adev);
 
-       amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_enable_buffer_funcs(adev);
 
        if (r)
                return r;
@@ -4213,7 +4213,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
        /* disable ras feature must before hw fini */
        amdgpu_ras_pre_fini(adev);
 
-       amdgpu_ttm_set_buffer_funcs_status(adev, false);
+       amdgpu_ttm_disable_buffer_funcs(adev);
 
        /*
         * device went through surprise hotplug; we need to destroy topology
@@ -4480,7 +4480,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
        if (r)
                goto unwind_userq;
 
-       amdgpu_ttm_set_buffer_funcs_status(adev, false);
+       amdgpu_ttm_disable_buffer_funcs(adev);
 
        amdgpu_fence_driver_hw_fini(adev);
 
@@ -4494,7 +4494,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
        return 0;
 
 unwind_evict:
-       amdgpu_ttm_set_buffer_funcs_status(adev, true);
+       amdgpu_ttm_enable_buffer_funcs(adev);
        amdgpu_fence_driver_hw_init(adev);
 
 unwind_userq:
@@ -5228,7 +5228,7 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_reset_context *reset_context)
                                if (r)
                                        goto out;
 
-                               amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true);
+                               amdgpu_ttm_enable_buffer_funcs(tmp_adev);
 
                                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 0d361f7c8386c3deb6a29b9bf43c8138d88b78fc..82d479621375f104f351d5a77c4b49fb8a879f9c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2098,7 +2098,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
        }
 
        /* Change the size here instead of the init above so only lpfn is affected */
-       amdgpu_ttm_set_buffer_funcs_status(adev, false);
+       amdgpu_ttm_disable_buffer_funcs(adev);
 #ifdef CONFIG_64BIT
 #ifdef CONFIG_X86
        if (adev->gmc.xgmi.connected_to_cpu)
@@ -2278,116 +2278,92 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 }
 
 /**
- * amdgpu_ttm_set_buffer_funcs_status - enable/disable use of buffer functions
+ * amdgpu_ttm_enable_buffer_funcs - enable use of buffer functions
  *
  * @adev: amdgpu_device pointer
- * @enable: true when we can use buffer functions.
  *
- * Enable/disable use of buffer functions during suspend/resume. This should
+ * Enable use of buffer functions during suspend/resume. This should
  * only be called at bootup or when userspace isn't running.
  */
-void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
+void amdgpu_ttm_enable_buffer_funcs(struct amdgpu_device *adev)
 {
        struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
        u32 num_clear_entities, num_move_entities;
-       uint64_t size;
        int r, i, j;
 
        if (!adev->mman.initialized || amdgpu_in_reset(adev) ||
-           adev->mman.buffer_funcs_enabled == enable || adev->gmc.is_app_apu)
+           adev->mman.buffer_funcs_enabled || adev->gmc.is_app_apu)
                return;
 
-       if (enable) {
-               if (!adev->mman.num_buffer_funcs_scheds) {
-                       dev_warn(adev->dev, "Not enabling DMA transfers for in kernel use");
-                       return;
-               }
+       if (!adev->mman.num_buffer_funcs_scheds) {
+               dev_warn(adev->dev, "Not enabling DMA transfers for in kernel use");
+               return;
+       }
 
-               num_clear_entities = MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MOVE_FENCES);
-               num_move_entities = MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MOVE_FENCES);
-               /* default_entity doesn't need multiple schedulers so pass only 1. */
-               r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
-                                                 &adev->mman.default_entity,
-                                                 DRM_SCHED_PRIORITY_KERNEL,
-                                                 adev->mman.buffer_funcs_scheds, 1, 0);
-               if (r < 0) {
-                       dev_err(adev->dev,
-                               "Failed setting up TTM entity (%d)\n", r);
-                       return;
-               }
+       /* default_entity doesn't need multiple schedulers so pass only 1. */
+       r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
+                                               &adev->mman.default_entity,
+                                               DRM_SCHED_PRIORITY_KERNEL,
+                                               adev->mman.buffer_funcs_scheds, 1, 0);
+       if (r < 0) {
+               dev_err(adev->dev,
+                       "Failed setting up TTM entity (%d)\n", r);
+               return;
+       }
 
-               adev->mman.clear_entities = kcalloc(num_clear_entities,
-                                                   sizeof(struct amdgpu_ttm_buffer_entity),
-                                                   GFP_KERNEL);
-               atomic_set(&adev->mman.next_clear_entity, 0);
-               if (!adev->mman.clear_entities)
-                       goto error_free_default_entity;
+       num_clear_entities = MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MOVE_FENCES);
+       num_move_entities = MIN(adev->mman.num_buffer_funcs_scheds, TTM_NUM_MOVE_FENCES);
 
-               adev->mman.num_clear_entities = num_clear_entities;
-
-               for (i = 0; i < num_clear_entities; i++) {
-                       r = amdgpu_ttm_buffer_entity_init(
-                               &adev->mman.gtt_mgr,
-                               &adev->mman.clear_entities[i],
-                               DRM_SCHED_PRIORITY_NORMAL,
-                               adev->mman.buffer_funcs_scheds,
-                               adev->mman.num_buffer_funcs_scheds, 1);
-
-                       if (r < 0) {
-                               for (j = 0; j < i; j++)
-                                       amdgpu_ttm_buffer_entity_fini(
-                                               &adev->mman.gtt_mgr, &adev->mman.clear_entities[j]);
-                               kfree(adev->mman.clear_entities);
-                               adev->mman.num_clear_entities = 0;
-                               adev->mman.clear_entities = NULL;
-                               goto error_free_default_entity;
-                       }
+       adev->mman.clear_entities = kcalloc(num_clear_entities,
+                                               sizeof(struct amdgpu_ttm_buffer_entity),
+                                               GFP_KERNEL);
+       atomic_set(&adev->mman.next_clear_entity, 0);
+       if (!adev->mman.clear_entities)
+               goto error_free_default_entity;
+
+       adev->mman.num_clear_entities = num_clear_entities;
+
+       for (i = 0; i < num_clear_entities; i++) {
+               r = amdgpu_ttm_buffer_entity_init(
+                       &adev->mman.gtt_mgr,
+                       &adev->mman.clear_entities[i],
+                       DRM_SCHED_PRIORITY_NORMAL,
+                       adev->mman.buffer_funcs_scheds,
+                       adev->mman.num_buffer_funcs_scheds, 1);
+
+               if (r < 0) {
+                       for (j = 0; j < i; j++)
+                               amdgpu_ttm_buffer_entity_fini(
+                                       &adev->mman.gtt_mgr, &adev->mman.clear_entities[j]);
+                       adev->mman.num_clear_entities = 0;
+                       kfree(adev->mman.clear_entities);
+                       goto error_free_default_entity;
                }
+       }
 
-               adev->mman.num_move_entities = num_move_entities;
-               atomic_set(&adev->mman.next_move_entity, 0);
-               for (i = 0; i < num_move_entities; i++) {
-                       r = amdgpu_ttm_buffer_entity_init(
-                               &adev->mman.gtt_mgr,
-                               &adev->mman.move_entities[i],
-                               DRM_SCHED_PRIORITY_NORMAL,
-                               adev->mman.buffer_funcs_scheds,
-                               adev->mman.num_buffer_funcs_scheds, 2);
-
-                       if (r < 0) {
-                               for (j = 0; j < i; j++)
-                                       amdgpu_ttm_buffer_entity_fini(
-                                               &adev->mman.gtt_mgr, &adev->mman.move_entities[j]);
-                               adev->mman.num_move_entities = 0;
-                               goto error_free_clear_entities;
-                       }
+       adev->mman.num_move_entities = num_move_entities;
+       atomic_set(&adev->mman.next_move_entity, 0);
+       for (i = 0; i < num_move_entities; i++) {
+               r = amdgpu_ttm_buffer_entity_init(
+                       &adev->mman.gtt_mgr,
+                       &adev->mman.move_entities[i],
+                       DRM_SCHED_PRIORITY_NORMAL,
+                       adev->mman.buffer_funcs_scheds,
+                       adev->mman.num_buffer_funcs_scheds, 2);
+
+               if (r < 0) {
+                       for (j = 0; j < i; j++)
+                               amdgpu_ttm_buffer_entity_fini(
+                                       &adev->mman.gtt_mgr,
+                                       &adev->mman.move_entities[j]);
+                       adev->mman.num_move_entities = 0;
+                       goto error_free_clear_entities;
                }
-       } else {
-               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
-                                             &adev->mman.default_entity);
-               for (i = 0; i < adev->mman.num_clear_entities; i++)
-                       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
-                                                     &adev->mman.clear_entities[i]);
-               for (i = 0; i < adev->mman.num_move_entities; i++)
-                       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
-                                                     &adev->mman.move_entities[i]);
-               /* Drop all the old fences since re-creating the scheduler entities
-                * will allocate new contexts.
-                */
-               ttm_resource_manager_cleanup(man);
-               kfree(adev->mman.clear_entities);
-               adev->mman.clear_entities = NULL;
-               adev->mman.num_clear_entities = 0;
-               adev->mman.num_move_entities = 0;
        }
 
        /* this just adjusts TTM size idea, which sets lpfn to the correct value */
-       if (enable)
-               size = adev->gmc.real_vram_size;
-       else
-               size = adev->gmc.visible_vram_size;
-       man->size = size;
-       adev->mman.buffer_funcs_enabled = enable;
+       man->size = adev->gmc.real_vram_size;
+       adev->mman.buffer_funcs_enabled = true;
 
        return;
 
@@ -2403,6 +2379,42 @@ error_free_default_entity:
                                      &adev->mman.default_entity);
 }
 
+/**
+ * amdgpu_ttm_disable_buffer_funcs - disable use of buffer functions
+ *
+ * @adev: amdgpu_device pointer
+ */
+void amdgpu_ttm_disable_buffer_funcs(struct amdgpu_device *adev)
+{
+       struct ttm_resource_manager *man =
+               ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
+       int i;
+
+       if (!adev->mman.buffer_funcs_enabled || amdgpu_in_reset(adev))
+               return;
+
+       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                     &adev->mman.default_entity);
+       for (i = 0; i < adev->mman.num_move_entities; i++)
+               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                             &adev->mman.move_entities[i]);
+       for (i = 0; i < adev->mman.num_clear_entities; i++)
+               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                             &adev->mman.clear_entities[i]);
+       /* Drop all the old fences since re-creating the scheduler entities
+        * will allocate new contexts.
+        */
+       ttm_resource_manager_cleanup(man);
+
+       kfree(adev->mman.clear_entities);
+       adev->mman.clear_entities = NULL;
+       adev->mman.num_clear_entities = 0;
+       adev->mman.num_move_entities = 0;
+
+       man->size = adev->gmc.visible_vram_size;
+       adev->mman.buffer_funcs_enabled = false;
+}
+
 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev,
                                  struct amdgpu_ttm_buffer_entity *entity,
                                  unsigned int num_dw,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index 2e4b1c03ccca7db5cbc95bfd949ce5d16923e91d..2d72fa217274527f5454514554de592a8d109e62 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -185,8 +185,8 @@ void amdgpu_ttm_unmark_vram_reserved(struct amdgpu_device *adev,
 
 int amdgpu_ttm_init(struct amdgpu_device *adev);
 void amdgpu_ttm_fini(struct amdgpu_device *adev);
-void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev,
-                                       bool enable);
+void amdgpu_ttm_enable_buffer_funcs(struct amdgpu_device *adev);
+void amdgpu_ttm_disable_buffer_funcs(struct amdgpu_device *adev);
 int amdgpu_copy_buffer(struct amdgpu_device *adev,
                       struct amdgpu_ttm_buffer_entity *entity,
                       uint64_t src_offset,