| Message ID | 1441713391-24732-10-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi On Tue, Sep 8, 2015 at 1:56 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > drm core enforces now for DRIVER_MODESET that all ioctls are unlocked. > And all the old nasty ones from drm core aren't allowed for modern > drivers any more. Hence this is no longer needed. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index e13b20bd9908..2320ba8c5eb1 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -1068,14 +1068,6 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev, > mutex_unlock(&dev->master_mutex); > > /* > - * Taking the drm_global_mutex after the TTM lock might deadlock > - */ > - if (!(flags & DRM_UNLOCKED)) { > - DRM_ERROR("Refusing locked ioctl access.\n"); > - return ERR_PTR(-EDEADLK); > - } Yeah, just drop that right away, regardless of the core changes. We have lockdep or WARN_ON() for such checks. Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Thanks David > - > - /* > * Take the TTM lock. Possibly sleep waiting for the authenticating > * master to become master again, or for a SIGTERM if the > * authenticating master exits. > -- > 2.5.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index e13b20bd9908..2320ba8c5eb1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1068,14 +1068,6 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev, mutex_unlock(&dev->master_mutex); /* - * Taking the drm_global_mutex after the TTM lock might deadlock - */ - if (!(flags & DRM_UNLOCKED)) { - DRM_ERROR("Refusing locked ioctl access.\n"); - return ERR_PTR(-EDEADLK); - } - - /* * Take the TTM lock. Possibly sleep waiting for the authenticating * master to become master again, or for a SIGTERM if the * authenticating master exits.
drm core enforces now for DRIVER_MODESET that all ioctls are unlocked. And all the old nasty ones from drm core aren't allowed for modern drivers any more. Hence this is no longer needed. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 -------- 1 file changed, 8 deletions(-)