drm: Nuke ums vgaarb support
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 25 Jan 2017 06:26:53 +0000 (07:26 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 26 Jan 2017 09:45:31 +0000 (10:45 +0100)
i915, nouveau (ever since merged to upstream) and radeon all lack ums
support in upstream. No point keeping the ums vgaarb support around.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-12-daniel.vetter@ffwll.ch
drivers/gpu/drm/drm_irq.c
include/drm/drm_drv.h

index 87a85f976d408a5993d11f6c33d80813916ac57f..e06cf11ebb4a92154af07d3266b9e2ed6eb0eee5 100644 (file)
@@ -415,29 +415,6 @@ err:
 }
 EXPORT_SYMBOL(drm_vblank_init);
 
-static void drm_irq_vgaarb_nokms(void *cookie, bool state)
-{
-       struct drm_device *dev = cookie;
-
-       if (dev->driver->vgaarb_irq) {
-               dev->driver->vgaarb_irq(dev, state);
-               return;
-       }
-
-       if (!dev->irq_enabled)
-               return;
-
-       if (state) {
-               if (dev->driver->irq_uninstall)
-                       dev->driver->irq_uninstall(dev);
-       } else {
-               if (dev->driver->irq_preinstall)
-                       dev->driver->irq_preinstall(dev);
-               if (dev->driver->irq_postinstall)
-                       dev->driver->irq_postinstall(dev);
-       }
-}
-
 /**
  * drm_irq_install - install IRQ handler
  * @dev: DRM device
@@ -492,9 +469,6 @@ int drm_irq_install(struct drm_device *dev, int irq)
                return ret;
        }
 
-       if (drm_core_check_feature(dev, DRIVER_LEGACY))
-               vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
-
        /* After installing handler */
        if (dev->driver->irq_postinstall)
                ret = dev->driver->irq_postinstall(dev);
index af75fc6ec830cc18080985e7cc8a8876c59ffbe2..8391135b95f2c4f3078ed880aae2258576fed580 100644 (file)
@@ -345,9 +345,6 @@ struct drm_driver {
        int (*gem_prime_mmap)(struct drm_gem_object *obj,
                                struct vm_area_struct *vma);
 
-       /* vga arb irq handler */
-       void (*vgaarb_irq)(struct drm_device *dev, bool state);
-
        /**
         * @dumb_create:
         *