Skip to content

Commit

Permalink
drm/irq: Look up the pci irq directly in the drm_control ioctl
Browse files Browse the repository at this point in the history
It's only ever called for legacy drivers, which are all pci.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Apr 23, 2014
1 parent 7c1a38e commit a319c1a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/drm_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ int drm_control(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_control *ctl = data;
int ret = 0;
int ret = 0, irq;

/* if we haven't irq we fallback for compatibility reasons -
* this used to be a separate function in drm_dma.h
Expand All @@ -393,8 +393,10 @@ int drm_control(struct drm_device *dev, void *data,

switch (ctl->func) {
case DRM_INST_HANDLER:
irq = dev->pdev->irq;

if (dev->if_version < DRM_IF_VERSION(1, 2) &&
ctl->irq != drm_dev_to_irq(dev))
ctl->irq != irq)
return -EINVAL;
mutex_lock(&dev->struct_mutex);
ret = drm_irq_install(dev);
Expand Down

0 comments on commit a319c1a

Please sign in to comment.