drm/qxl: Convert to Linux IRQ interfaces
Subsystems (4)
Thomas Zimmermann
maintainerPATCH 1/1 drm/qxl: Convert to Linux IRQ interfaces
Drop the DRM IRQ midlayer in favor of Linux IRQ interfaces. DRM's IRQ helpers are mostly useful for UMS drivers. Modern KMS drivers don't benefit from using it.
Signed-off-by Thomas Zimmermann <[email protected]>
--- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_irq.c | 9 +++++---- 3 files changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +0 -1
@@ -284,7 +284,6 @@ static struct drm_driver qxl_driver = { .gem_prime_mmap = qxl_gem_prime_mmap, .fops = &qxl_fops, .ioctls = qxl_ioctls, - .irq_handler = qxl_irq_handler, .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = DRIVER_DATE,
drivers/gpu/drm/qxl/qxl_drv.h +0 -1
@@ -439,7 +439,6 @@ int qxl_gem_prime_mmap(struct drm_gem_object *obj,/* qxl_irq.c */ int qxl_irq_init (struct qxl_device *qdev); -irqreturn_t qxl_irq_handler (int irq,void *arg); void qxl_debugfs_add_files(struct qxl_device *qdev, struct drm_info_list *files,
drivers/gpu/drm/qxl/qxl_irq.c +5 -4
@@ -25,11 +25,11 @@#include <linux/pci.h> -#include <drm/drm_irq.h> +#include <drm/drm_drv.h> #include "qxl_drv.h" -irqreturn_t qxl_irq_handler (int irq,void *arg) +static irqreturn_t qxl_irq_handler (int irq,void *arg) {struct drm_device *dev = (struct drm_device *) arg;struct qxl_device *qdev =to_qxl (dev);
@@ -81,7 +81,8 @@ static void qxl_client_monitors_config_work_func(struct work_struct *work)int qxl_irq_init (struct qxl_device *qdev) { -struct pci_dev *pdev =to_pci_dev (qdev->ddev.dev); +struct drm_device *ddev = &qdev->ddev; +struct pci_dev *pdev =to_pci_dev (ddev->dev);int ret;init_waitqueue_head (&qdev->display_event);
@@ -95,7 +96,7 @@ int qxl_irq_init(struct qxl_device *qdev)atomic_set (&qdev->irq_received_cursor,0 );atomic_set (&qdev->irq_received_io_cmd,0 ); qdev->irq_received_error =0 ; - ret =drm_irq_install (&qdev->ddev, pdev->irq); + ret =request_irq (pdev->irq, qxl_irq_handler,IRQF_SHARED , ddev->driver->name, ddev); qdev->ram_header->int_mask =QXL_INTERRUPT_MASK ;if (unlikely (ret !=0 )) {DRM_ERROR ("Failed installing irq: %d\n" , ret);
Signature · 1 line
2.32.0
Quoted 5 lines · Thomas Zimmermann
Drop the DRM IRQ midlayer in favor of Linux IRQ interfaces. DRM's IRQ helpers are mostly useful for UMS drivers. Modern KMS drivers don't benefit from using it.
Signed-off-by Thomas Zimmermann <[email protected]>
Looks correct,
Acked-by Sam Ravnborg <[email protected]>
Sam