Hi On Tue, Sep 8, 2015 at 1:56 PM, Daniel Vetter <daniel.vetter@xxxxxxxx> 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@xxxxxxxxx> > --- > 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@xxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx