diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-05-30 00:58:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-07-17 22:05:48 +0200 |
| commit | 29935554b384b1b3a7377d6f0b03b21d18a61683 (patch) | |
| tree | a79b4e7322a46881bd38816ea153741f5c523e3c | |
| parent | Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into d... (diff) | |
| download | linux-29935554b384b1b3a7377d6f0b03b21d18a61683.tar.xz linux-29935554b384b1b3a7377d6f0b03b21d18a61683.zip | |
drm: Disallow DRM_IOCTL_MODESET_CTL for KMS drivers
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>
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index c798eeae0a03..03f16f352fe2 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -974,7 +974,6 @@ EXPORT_SYMBOL(drm_vblank_off); * drm_vblank_pre_modeset - account for vblanks across mode sets * @dev: DRM device * @crtc: CRTC in question - * @post: post or pre mode set? * * Account for vblank events across mode setting events, which will likely * reset the hardware frame counter. @@ -1037,6 +1036,10 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, if (!dev->num_crtcs) return 0; + /* KMS drivers handle this internally */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) + return 0; + crtc = modeset->crtc; if (crtc >= dev->num_crtcs) return -EINVAL; |