diff options
| author | Jason Wang <jasowang@redhat.com> | 2014-05-12 16:35:39 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 08:00:07 -0700 |
| commit | 1ed9cbc93c613efa69df58a1d4c8037adb105f43 (patch) | |
| tree | 872ba4067d834eda94288718c4b78bcd1a05deec /drivers | |
| parent | e1bb259863012b0498678e0c319a9420d2108215 (diff) | |
| download | linux-3.10-1ed9cbc93c613efa69df58a1d4c8037adb105f43.tar.gz linux-3.10-1ed9cbc93c613efa69df58a1d4c8037adb105f43.tar.bz2 linux-3.10-1ed9cbc93c613efa69df58a1d4c8037adb105f43.zip | |
drm/qxl: return IRQ_NONE if it was not our irq
commit fbb60fe35ad579b511de8604b06a30b43846473b upstream.
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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -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 21393dc4700..f4b6b89b98f 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(DRM_IRQ_ARGS) pending = xchg(&qdev->ram_header->int_pending, 0); + if (!pending) + return IRQ_NONE; + atomic_inc(&qdev->irq_received); if (pending & QXL_INTERRUPT_DISPLAY) { |