| Message ID | 20180327082356.24516-1-daniel.vetter@ffwll.ch |
|---|---|
| State | Accepted |
| Commit | 606f1fc5cf2c27e86f2ea03d293e77fac789fae5 |
| Headers | show |
| Series |
"Series without cover letter"
( rev:
1
2
)
in
DRI devel |
diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c index e18642e5027e..f6d26beffa54 100644 --- a/drivers/staging/vboxvideo/vbox_drv.c +++ b/drivers/staging/vboxvideo/vbox_drv.c @@ -242,7 +242,7 @@ static struct drm_driver driver = { .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, - .gem_free_object = vbox_gem_free_object, + .gem_free_object_unlocked = vbox_gem_free_object, .dumb_create = vbox_dumb_create, .dumb_map_offset = vbox_dumb_mmap_offset, .dumb_destroy = drm_gem_dumb_destroy,
On Tue, Mar 27, 2018 at 10:23:52AM +0200, Daniel Vetter wrote: > vboxvideo doesn't use dev->struct_mutex and therefore has no need to use > gem_free_object. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Michael Thayer <michael.thayer@oracle.com> > Cc: Colin Ian King <colin.king@canonical.com> > Cc: Daniel Vetter <daniel.vetter@intel.com> > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/staging/vboxvideo/vbox_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Tue, Mar 27, 2018 at 10:34:07AM +0200, Greg Kroah-Hartman wrote: > On Tue, Mar 27, 2018 at 10:23:52AM +0200, Daniel Vetter wrote: > > vboxvideo doesn't use dev->struct_mutex and therefore has no need to use > > gem_free_object. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cc: Hans de Goede <hdegoede@redhat.com> > > Cc: Michael Thayer <michael.thayer@oracle.com> > > Cc: Colin Ian King <colin.king@canonical.com> > > Cc: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > > --- > > drivers/staging/vboxvideo/vbox_drv.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> You'll pick this up or ack for stuffing into drm-misc (but only for 4.18)? There's no other patches that need this (we still have some drivers using the gem_free_object hook which won't be easy to convert to the _unlocked variant), so doesn't matter which tree. -Daniel
On Tue, Mar 27, 2018 at 11:18:03AM +0200, Daniel Vetter wrote: > On Tue, Mar 27, 2018 at 10:34:07AM +0200, Greg Kroah-Hartman wrote: > > On Tue, Mar 27, 2018 at 10:23:52AM +0200, Daniel Vetter wrote: > > > vboxvideo doesn't use dev->struct_mutex and therefore has no need to use > > > gem_free_object. > > > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > Cc: Hans de Goede <hdegoede@redhat.com> > > > Cc: Michael Thayer <michael.thayer@oracle.com> > > > Cc: Colin Ian King <colin.king@canonical.com> > > > Cc: Daniel Vetter <daniel.vetter@intel.com> > > > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > > > --- > > > drivers/staging/vboxvideo/vbox_drv.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > You'll pick this up or ack for stuffing into drm-misc (but only for 4.18)? Feel free to take it through your tree if you want. thanks, greg k-h
On Tue, Mar 27, 2018 at 05:25:21PM +0200, Greg Kroah-Hartman wrote: > On Tue, Mar 27, 2018 at 11:18:03AM +0200, Daniel Vetter wrote: > > On Tue, Mar 27, 2018 at 10:34:07AM +0200, Greg Kroah-Hartman wrote: > > > On Tue, Mar 27, 2018 at 10:23:52AM +0200, Daniel Vetter wrote: > > > > vboxvideo doesn't use dev->struct_mutex and therefore has no need to use > > > > gem_free_object. > > > > > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > Cc: Hans de Goede <hdegoede@redhat.com> > > > > Cc: Michael Thayer <michael.thayer@oracle.com> > > > > Cc: Colin Ian King <colin.king@canonical.com> > > > > Cc: Daniel Vetter <daniel.vetter@intel.com> > > > > Cc: Stephen Rothwell <sfr@canb.auug.org.au> > > > > --- > > > > drivers/staging/vboxvideo/vbox_drv.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > You'll pick this up or ack for stuffing into drm-misc (but only for 4.18)? > > Feel free to take it through your tree if you want. Pushed the first 3 from this series to drm-misc-next for 4.18. -Daniel
vboxvideo doesn't use dev->struct_mutex and therefore has no need to use gem_free_object. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Michael Thayer <michael.thayer@oracle.com> Cc: Colin Ian King <colin.king@canonical.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/staging/vboxvideo/vbox_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)