| Message ID | 1464630800-30786-28-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Daniel, Am Montag, den 30.05.2016, 19:53 +0200 schrieb Daniel Vetter: > No dev->struct_mutex anywhere to be seen. > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index b1223d54d0ab..06a417b2f91e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -243,7 +243,7 @@ static struct drm_driver mtk_drm_driver = { > .enable_vblank = mtk_drm_crtc_enable_vblank, > .disable_vblank = mtk_drm_crtc_disable_vblank, > > - .gem_free_object = mtk_drm_gem_free_object, > + .gem_free_object_unlocked = mtk_drm_gem_free_object, > .gem_vm_ops = &drm_gem_cma_vm_ops, > .dumb_create = mtk_drm_gem_dumb_create, > .dumb_map_offset = mtk_drm_gem_dumb_map_offset, Thanks, I've sent this already: https://patchwork.kernel.org/patch/9058621/ If you'd like me to drop that from the next pull request, let me know and have my Acked-by: Philipp Zabel <p.zabel@pengutronix.de> for this patch. regards Philipp
On Tue, May 31, 2016 at 8:22 AM, Philipp Zabel <p.zabel@pengutronix.de> wrote: > Am Montag, den 30.05.2016, 19:53 +0200 schrieb Daniel Vetter: >> No dev->struct_mutex anywhere to be seen. >> >> Cc: Philipp Zabel <p.zabel@pengutronix.de> >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> >> --- >> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> index b1223d54d0ab..06a417b2f91e 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> @@ -243,7 +243,7 @@ static struct drm_driver mtk_drm_driver = { >> .enable_vblank = mtk_drm_crtc_enable_vblank, >> .disable_vblank = mtk_drm_crtc_disable_vblank, >> >> - .gem_free_object = mtk_drm_gem_free_object, >> + .gem_free_object_unlocked = mtk_drm_gem_free_object, >> .gem_vm_ops = &drm_gem_cma_vm_ops, >> .dumb_create = mtk_drm_gem_dumb_create, >> .dumb_map_offset = mtk_drm_gem_dumb_map_offset, > > Thanks, I've sent this already: > https://patchwork.kernel.org/patch/9058621/ > If you'd like me to drop that from the next pull request, let me know > and have my > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > for this patch. Like I said I want to send this out this week (early feature pulls are good!) and I'm kinda too lazy to remember which drivers are fixed up somewhere else - there's way too many different trees for my taste ;-) I think I'll just keep this one here. For next time around just send out your patch queue in a pull request (even if it's just 1 patch), or ping me on irc to smash it into drm-misc instead. Waiting with pull request because you don't have enough yet isn't a good approach and leads to duplicated work like here. -Daniel
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index b1223d54d0ab..06a417b2f91e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -243,7 +243,7 @@ static struct drm_driver mtk_drm_driver = { .enable_vblank = mtk_drm_crtc_enable_vblank, .disable_vblank = mtk_drm_crtc_disable_vblank, - .gem_free_object = mtk_drm_gem_free_object, + .gem_free_object_unlocked = mtk_drm_gem_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = mtk_drm_gem_dumb_create, .dumb_map_offset = mtk_drm_gem_dumb_map_offset,
No dev->struct_mutex anywhere to be seen. Cc: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)