Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next

 Add a new list.h helper for doing bulk updates.  Used by ttm.
- Fixes for display underflow on VI APUs at 4K with UVD running
- Endian fixes for powerplay on vega
- DC fixes for interlaced video
- Vega20 powerplay fixes
- RV/RV2/PCO powerplay fixes
- Fix for spurious ACPI events on HG laptops
- Fix a memory leak in DC on driver unload
- Fixes for manual fan control mode switching
- Suspend/resume robustness fixes
- Fix display handling on RV2
- VCN fixes for DPG on PCO
- Misc code cleanups and warning fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011014739.3117-1-alexander.deucher@amd.com

1 files changed, 52 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index a64056dadc58..81732a84c2ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -40,6 +40,30 @@
 #include "amdgpu_gem.h"
 #include "amdgpu_display.h"
 
+static void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
+{
+        struct amdgpu_gpu_instance *gpu_instance;
+        int i;
+
+        mutex_lock(&mgpu_info.mutex);
+
+        for (i = 0; i < mgpu_info.num_gpu; i++) {
+                gpu_instance = &(mgpu_info.gpu_ins[i]);
+                if (gpu_instance->adev == adev) {
+                        mgpu_info.gpu_ins[i] =
+                                mgpu_info.gpu_ins[mgpu_info.num_gpu - 1];
+                        mgpu_info.num_gpu--;
+                        if (adev->flags & AMD_IS_APU)
+                                mgpu_info.num_apu--;
+                        else
+                                mgpu_info.num_dgpu--;
+                        break;
+                }
+        }
+
+        mutex_unlock(&mgpu_info.mutex);
+}
+
 /**
  * amdgpu_driver_unload_kms - Main unload function for KMS.
  *
@@ -55,6 +79,8 @@ void amdgpu_driver_unload_kms(struct drm_device *dev)
         if (adev == NULL)
                 return;
 
+        amdgpu_unregister_gpu_instance(adev);
+
         if (adev->rmmio == NULL)
                 goto done_free;
 
@@ -75,6 +101,31 @@ done_free:
         dev->dev_private = NULL;
 }
 
+static void amdgpu_register_gpu_instance(struct amdgpu_device *adev)
+{
+        struct amdgpu_gpu_instance *gpu_instance;
+
+        mutex_lock(&mgpu_info.mutex);
+
+        if (mgpu_info.num_gpu >= MAX_GPU_INSTANCE) {
+                DRM_ERROR("Cannot register more gpu instance\n");
+                mutex_unlock(&mgpu_info.mutex);
+                return;
+        }
+
+        gpu_instance = &(mgpu_info.gpu_ins[mgpu_info.num_gpu]);
+        gpu_instance->adev = adev;
+        gpu_instance->mgpu_fan_enabled = 0;
+
+        mgpu_info.num_gpu++;
+        if (adev->flags & AMD_IS_APU)
+                mgpu_info.num_apu++;
+        else
+                mgpu_info.num_dgpu++;
+
+        mutex_unlock(&mgpu_info.mutex);
+}
+
 /**
  * amdgpu_driver_load_kms - Main load function for KMS.
  *
@@ -169,6 +220,7 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
                 pm_runtime_put_autosuspend(dev->dev);
         }
 
+        amdgpu_register_gpu_instance(adev);
 out:
         if (r) {
                 /* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */