From aa3d18a344a199cbef3955bcdf18f68036076420 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 25 Jun 2021 10:22:20 +0200 Subject: drm/vmwgfx: Don't set struct drm_device.irq_enabled The field drm_device.irq_enabled is only used by legacy drivers with userspace modesetting. Don't set it in vmxgfx. All usage of the field within vmwgfx can safely be removed. Signed-off-by: Thomas Zimmermann Reviewed-by: Zack Rusin Reviewed-by: Laurent Pinchart Acked-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20210625082222.3845-26-tzimmermann@suse.de --- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/gpu/drm/vmwgfx') diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c index b9a9b7ddadbd..4b82f5995452 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c @@ -292,15 +292,11 @@ void vmw_irq_uninstall(struct drm_device *dev) if (!(dev_priv->capabilities & SVGA_CAP_IRQMASK)) return; - if (!dev->irq_enabled) - return; - vmw_write(dev_priv, SVGA_REG_IRQMASK, 0); status = vmw_irq_status_read(dev_priv); vmw_irq_status_write(dev_priv, status); - dev->irq_enabled = false; free_irq(dev->irq, dev); } @@ -315,9 +311,6 @@ int vmw_irq_install(struct drm_device *dev, int irq) { int ret; - if (dev->irq_enabled) - return -EBUSY; - vmw_irq_preinstall(dev); ret = request_threaded_irq(irq, vmw_irq_handler, vmw_thread_fn, @@ -325,7 +318,6 @@ int vmw_irq_install(struct drm_device *dev, int irq) if (ret < 0) return ret; - dev->irq_enabled = true; dev->irq = irq; return ret; -- cgit v1.2.3-59-g8ed1b