projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-misc-next-2021-07-16' of git://anongit.freedesktop.org/drm/drm-misc...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
qxl
/
qxl_irq.c
diff --git
a/drivers/gpu/drm/qxl/qxl_irq.c
b/drivers/gpu/drm/qxl/qxl_irq.c
index
d312322
..
665278e
100644
(file)
--- a/
drivers/gpu/drm/qxl/qxl_irq.c
+++ b/
drivers/gpu/drm/qxl/qxl_irq.c
@@
-25,11
+25,11
@@
#include <linux/pci.h>
#include <linux/pci.h>
-#include <drm/drm_
irq
.h>
+#include <drm/drm_
drv
.h>
#include "qxl_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);
{
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)
{
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);
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;
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);
qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
if (unlikely(ret != 0)) {
DRM_ERROR("Failed installing irq: %d\n", ret);