|
@@ -735,9 +735,8 @@ long drm_ioctl(struct file *filp,
|
|
if (ksize > in_size)
|
|
if (ksize > in_size)
|
|
memset(kdata + in_size, 0, ksize - in_size);
|
|
memset(kdata + in_size, 0, ksize - in_size);
|
|
|
|
|
|
- /* Enforce sane locking for modern driver ioctls. Core ioctls are
|
|
|
|
- * too messy still. */
|
|
|
|
- if ((!drm_core_check_feature(dev, DRIVER_LEGACY) && is_driver_ioctl) ||
|
|
|
|
|
|
+ /* Enforce sane locking for modern driver ioctls. */
|
|
|
|
+ if (!drm_core_check_feature(dev, DRIVER_LEGACY) ||
|
|
(ioctl->flags & DRM_UNLOCKED))
|
|
(ioctl->flags & DRM_UNLOCKED))
|
|
retcode = func(dev, kdata, file_priv);
|
|
retcode = func(dev, kdata, file_priv);
|
|
else {
|
|
else {
|