[PATCH 11/15] drm: Nuke ums vgaarb support
Alex Deucher
alexdeucher at gmail.com
Wed Jan 25 17:40:20 UTC 2017
On Wed, Jan 25, 2017 at 1:26 AM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> i915, nouveau (ever since merged to upstream) and radeon all lack ums
> support in upstream. No point keeping the ums vgaarb support around.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/drm_irq.c | 26 --------------------------
> include/drm/drm_drv.h | 3 ---
> 2 files changed, 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 1c4da043eeda..954960cc68e7 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -415,29 +415,6 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
> }
> 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);
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index af75fc6ec830..8391135b95f2 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -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:
> *
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list