Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[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 0cc4c67f95f721f7671d5e46824b0b0d5e70e7fa..300ac73b47382db380d766581e5ef75f8451ca52 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -85,7 +85,7 @@ static void amdgpu_hotplug_work_func(struct work_struct *work)
 {
        struct amdgpu_device *adev = container_of(work, struct amdgpu_device,
                                                  hotplug_work);
-       struct drm_device *dev = adev->ddev;
+       struct drm_device *dev = adev_to_drm(adev);
        struct drm_mode_config *mode_config = &dev->mode_config;
        struct drm_connector *connector;
        struct drm_connector_list_iter iter;
@@ -151,7 +151,7 @@ void amdgpu_irq_disable_all(struct amdgpu_device *adev)
 irqreturn_t amdgpu_irq_handler(int irq, void *arg)
 {
        struct drm_device *dev = (struct drm_device *) arg;
-       struct amdgpu_device *adev = dev->dev_private;
+       struct amdgpu_device *adev = drm_to_adev(dev);
        irqreturn_t ret;
 
        ret = amdgpu_ih_process(adev, &adev->irq.ih);
@@ -268,9 +268,9 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
                if (!adev->enable_virtual_display)
                        /* Disable vblank IRQs aggressively for power-saving */
                        /* XXX: can this be enabled for DC? */
-                       adev->ddev->vblank_disable_immediate = true;
+                       adev_to_drm(adev)->vblank_disable_immediate = true;
 
-               r = drm_vblank_init(adev->ddev, adev->mode_info.num_crtc);
+               r = drm_vblank_init(adev_to_drm(adev), adev->mode_info.num_crtc);
                if (r)
                        return r;
 
@@ -284,14 +284,14 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
 
        adev->irq.installed = true;
        /* Use vector 0 for MSI-X */
-       r = drm_irq_install(adev->ddev, pci_irq_vector(adev->pdev, 0));
+       r = drm_irq_install(adev_to_drm(adev), pci_irq_vector(adev->pdev, 0));
        if (r) {
                adev->irq.installed = false;
                if (!amdgpu_device_has_dc_support(adev))
                        flush_work(&adev->hotplug_work);
                return r;
        }
-       adev->ddev->max_vblank_count = 0x00ffffff;
+       adev_to_drm(adev)->max_vblank_count = 0x00ffffff;
 
        DRM_DEBUG("amdgpu: irq initialized.\n");
        return 0;
@@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev)
        unsigned i, j;
 
        if (adev->irq.installed) {
-               drm_irq_uninstall(adev->ddev);
+               drm_irq_uninstall(adev_to_drm(adev));
                adev->irq.installed = false;
                if (adev->irq.msi_enabled)
                        pci_free_irq_vectors(adev->pdev);
@@ -522,7 +522,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev)
 int amdgpu_irq_get(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
                   unsigned type)
 {
-       if (!adev->ddev->irq_enabled)
+       if (!adev_to_drm(adev)->irq_enabled)
                return -ENOENT;
 
        if (type >= src->num_types)
@@ -552,7 +552,7 @@ int amdgpu_irq_get(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
 int amdgpu_irq_put(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
                   unsigned type)
 {
-       if (!adev->ddev->irq_enabled)
+       if (!adev_to_drm(adev)->irq_enabled)
                return -ENOENT;
 
        if (type >= src->num_types)
@@ -583,7 +583,7 @@ int amdgpu_irq_put(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
 bool amdgpu_irq_enabled(struct amdgpu_device *adev, struct amdgpu_irq_src *src,
                        unsigned type)
 {
-       if (!adev->ddev->irq_enabled)
+       if (!adev_to_drm(adev)->irq_enabled)
                return false;
 
        if (type >= src->num_types)