iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: Disallow DRM_IOCTL_MODESET_CTL for KMS drivers

Browse Source 
DRM_IOCTL_MODESET_CTL must only be used for UMS drivers. Make it a no-op
for KMS drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@gmail.com>
This commit is contained in:
Laurent Pinchart 2012-05-30 00:58:09 +02:00 committed by Dave Airlie
parent faadaf97e5
commit 29935554b3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/drm_irq.c
View File

@ -974,7 +974,6 @@ EXPORT_SYMBOL(drm_vblank_off);
* drm_vblank_pre_modeset - account for vblanks across mode sets * drm_vblank_pre_modeset - account for vblanks across mode sets
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @crtc: CRTC in question
* @post: post or pre mode set?
* *
* Account for vblank events across mode setting events, which will likely * Account for vblank events across mode setting events, which will likely
* reset the hardware frame counter. * reset the hardware frame counter.
@ -1037,6 +1036,10 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
if (!dev->num_crtcs) if (!dev->num_crtcs)
return 0; return 0;
/* KMS drivers handle this internally */
if (drm_core_check_feature(dev, DRIVER_MODESET))
return 0;
crtc = modeset->crtc; crtc = modeset->crtc;
if (crtc >= dev->num_crtcs) if (crtc >= dev->num_crtcs)
return -EINVAL; return -EINVAL;