diff options
| author | Jason Wang <jasowang@redhat.com> | 2014-05-12 10:35:39 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-17 00:08:06 +0200 |
| commit | fbb60fe35ad579b511de8604b06a30b43846473b (patch) | |
| tree | ddcd1857bd49fb4fc2880bc5ba0845c967cf15bf /drivers/gpu/drm/qxl/qxl_irq.c | |
| parent | Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
| download | linux-fbb60fe35ad579b511de8604b06a30b43846473b.tar.xz linux-fbb60fe35ad579b511de8604b06a30b43846473b.zip | |
drm/qxl: return IRQ_NONE if it was not our irq
Return IRQ_NONE if it was not our irq. This is necessary for the case
when qxl is sharing irq line with a device A in a crash kernel. If qxl
is initialized before A and A's irq was raised during this gap,
returning IRQ_HANDLED in this case will cause this irq to be raised
again after EOI since kernel think it was handled but in fact it was
not.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_irq.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c index 34d6a85e9023..0bf1e20c6e44 100644 --- a/drivers/gpu/drm/qxl/qxl_irq.c +++ b/drivers/gpu/drm/qxl/qxl_irq.c @@ -33,6 +33,9 @@ irqreturn_t qxl_irq_handler(int irq, void *arg) pending = xchg(&qdev->ram_header->int_pending, 0); + if (!pending) + return IRQ_NONE; + atomic_inc(&qdev->irq_received); if (pending & QXL_INTERRUPT_DISPLAY) { |