Merge tag 'mips_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_irq.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 56bcd59c3399a0a912ea1fa8f869c105b8827327..3a5ca462abf093457381bcaeae1a8e7ecb90b33e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -92,7 +92,7 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work)
 }
 
 /* Disable *all* interrupts */
 }
 
 /* Disable *all* interrupts */

-static void amdgpu_irq_disable_all(struct amdgpu_device *adev)
+void amdgpu_irq_disable_all(struct amdgpu_device *adev)

 {
        unsigned long irqflags;
        unsigned i, j, k;
 {
        unsigned long irqflags;
        unsigned i, j, k;


@@ -122,55 +122,6 @@ static void amdgpu_irq_disable_all(struct amdgpu_device *adev)
        spin_unlock_irqrestore(&adev->irq.lock, irqflags);
 }
 
        spin_unlock_irqrestore(&adev->irq.lock, irqflags);
 }
 

-/**
- * amdgpu_irq_preinstall - drm irq preinstall callback
- *
- * @dev: drm dev pointer
- *
- * Gets the hw ready to enable irqs (all asics).
- * This function disables all interrupt sources on the GPU.
- */
-void amdgpu_irq_preinstall(struct drm_device *dev)
-{
-       struct amdgpu_device *adev = dev->dev_private;
-
-       /* Disable *all* interrupts */
-       amdgpu_irq_disable_all(adev);
-       /* Clear bits */
-       amdgpu_ih_process(adev);
-}
-
-/**
- * amdgpu_irq_postinstall - drm irq preinstall callback
- *
- * @dev: drm dev pointer
- *
- * Handles stuff to be done after enabling irqs (all asics).
- * Returns 0 on success.
- */
-int amdgpu_irq_postinstall(struct drm_device *dev)
-{
-       dev->max_vblank_count = 0x00ffffff;
-       return 0;
-}
-
-/**
- * amdgpu_irq_uninstall - drm irq uninstall callback
- *
- * @dev: drm dev pointer
- *
- * This function disables all interrupt sources on the GPU (all asics).
- */
-void amdgpu_irq_uninstall(struct drm_device *dev)
-{
-       struct amdgpu_device *adev = dev->dev_private;
-
-       if (adev == NULL) {
-               return;
-       }
-       amdgpu_irq_disable_all(adev);
-}
-

 /**
  * amdgpu_irq_handler - irq handler
  *
 /**
  * amdgpu_irq_handler - irq handler
  *


@@ -257,10 +208,12 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
        r = drm_irq_install(adev->ddev, adev->ddev->pdev->irq);
        if (r) {
                adev->irq.installed = false;
        r = drm_irq_install(adev->ddev, adev->ddev->pdev->irq);
        if (r) {
                adev->irq.installed = false;

-               flush_work(&adev->hotplug_work);
+               if (!amdgpu_device_has_dc_support(adev))
+                       flush_work(&adev->hotplug_work);

                cancel_work_sync(&adev->reset_work);
                return r;
        }
                cancel_work_sync(&adev->reset_work);
                return r;
        }

+       adev->ddev->max_vblank_count = 0x00ffffff;

 
        DRM_DEBUG("amdgpu: irq initialized.\n");
        return 0;
 
        DRM_DEBUG("amdgpu: irq initialized.\n");
        return 0;


@@ -282,7 +235,8 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
                adev->irq.installed = false;
                if (adev->irq.msi_enabled)
                        pci_disable_msi(adev->pdev);
                adev->irq.installed = false;
                if (adev->irq.msi_enabled)
                        pci_disable_msi(adev->pdev);

-               flush_work(&adev->hotplug_work);
+               if (!amdgpu_device_has_dc_support(adev))
+                       flush_work(&adev->hotplug_work);

                cancel_work_sync(&adev->reset_work);
        }
 
                cancel_work_sync(&adev->reset_work);
        }
 


@@ -305,6 +259,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
                        }
                }
                kfree(adev->irq.client[i].sources);
                        }
                }
                kfree(adev->irq.client[i].sources);

+               adev->irq.client[i].sources = NULL;

        }
 }
 
        }
 }