diff mbox

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

Message ID 1397252175-14227-5-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter April 11, 2014, 9:36 p.m. UTC 
This just adds a correspdonding check, follow-up patches will exploit
this.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/drm_irq.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Thierry Reding April 17, 2014, 2:38 p.m. UTC | #1 
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@nvidia.com>
diff mbox

Patch

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;
+
 		return drm_irq_install(dev);
 	case DRM_UNINST_HANDLER:
-		if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
-			return 0;
-		if (drm_core_check_feature(dev, DRIVER_MODESET))
-			return 0;
 		return drm_irq_uninstall(dev);
 	default:
 		return -EINVAL;