[PATCH 04/18] drm/irq: drm_control is a legacy ioctl, so pci devices only

[Thierry Reding]

On Fri, Apr 11, 2014 at 11:36:01PM +0200, Daniel Vetter wrote:
[...]
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index c02b602325cb..4b019646f556 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -386,22 +386,22 @@ int drm_control(struct drm_device *dev, void *data,
>  	 * this used to be a separate function in drm_dma.h
>  	 */
>  
> +	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> +		return 0;
> +	if (drm_core_check_feature(dev, DRIVER_MODESET))
> +		return 0;
> +	/* UMS was only ever support on pci devices. */
> +	if (WARN_ON(!dev->pdev))
> +		return -EINVAL;
>  
>  	switch (ctl->func) {
>  	case DRM_INST_HANDLER:
> -		if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> -			return 0;
> -		if (drm_core_check_feature(dev, DRIVER_MODESET))
> -			return 0;
>  		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
>  		    ctl->irq != drm_dev_to_irq(dev))
>  			return -EINVAL;
> +

Nit: This blank line seems unnecessary, but either way:

Reviewed-by: Thierry Reding <treding at nvidia.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140417/cb034ffb/attachment.sig>