| Message ID | 1459254098-1278-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Daniel, On Tue, 2016-03-29 at 14:21 +0200, Daniel Vetter wrote: > Accidentally fell through the cracks in > > commit 6c87e5c3ec6db052f3744804a517b6fb003906e1 > Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com> > Date: Wed Mar 23 11:42:54 2016 +0300 > > drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() > > despite that Boris acked that patch. > > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: Alexey Brodkin <abrodkin@synopsys.com> > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 3d8d16402d07..8ab4318e57a1 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -615,7 +615,7 @@ err: > static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev) > { > mutex_lock(&dev->mode_config.mutex); > - drm_connector_unplug_all(dev); > + drm_connector_unregister_all(dev); > mutex_unlock(&dev->mode_config.mutex); > } Isn't done in my "[PATCH 2/3 v5] drm: atmel_hldc: Use generic drm_connector_register_all() helper"? -Alexey
On Tue, 29 Mar 2016 12:25:55 +0000 Alexey Brodkin <Alexey.Brodkin@synopsys.com> wrote: > Hi Daniel, > > On Tue, 2016-03-29 at 14:21 +0200, Daniel Vetter wrote: > > Accidentally fell through the cracks in > > > > commit 6c87e5c3ec6db052f3744804a517b6fb003906e1 > > Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com> > > Date: Wed Mar 23 11:42:54 2016 +0300 > > > > drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() > > > > despite that Boris acked that patch. My apologies for putting my ack on something I didn't even compile test. > > > > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > > Cc: Alexey Brodkin <abrodkin@synopsys.com> > > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > index 3d8d16402d07..8ab4318e57a1 100644 > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > @@ -615,7 +615,7 @@ err: > > static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev) > > { > > mutex_lock(&dev->mode_config.mutex); > > - drm_connector_unplug_all(dev); > > + drm_connector_unregister_all(dev); > > mutex_unlock(&dev->mode_config.mutex); > > } > > Isn't done in my "[PATCH 2/3 v5] drm: atmel_hldc: Use generic drm_connector_register_all() helper"? This is fixing v3 of your series. Apparently this problem is fixed in v4 and v5.
On Tue, Mar 29, 2016 at 12:25:55PM +0000, Alexey Brodkin wrote: > Hi Daniel, > > On Tue, 2016-03-29 at 14:21 +0200, Daniel Vetter wrote: > > Accidentally fell through the cracks in > > > > commit 6c87e5c3ec6db052f3744804a517b6fb003906e1 > > Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com> > > Date: Wed Mar 23 11:42:54 2016 +0300 > > > > drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() > > > > despite that Boris acked that patch. > > > > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > > Cc: Alexey Brodkin <abrodkin@synopsys.com> > > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > index 3d8d16402d07..8ab4318e57a1 100644 > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > > @@ -615,7 +615,7 @@ err: > > static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev) > > { > > mutex_lock(&dev->mode_config.mutex); > > - drm_connector_unplug_all(dev); > > + drm_connector_unregister_all(dev); > > mutex_unlock(&dev->mode_config.mutex); > > } > > Isn't done in my "[PATCH 2/3 v5] drm: atmel_hldc: Use generic drm_connector_register_all() helper"? Yes, but splitting it like that breaks bisectability, which isn't good. Also your atmel change drops the mode_config.mutex. We might want to have that part in a separate patch, so that the atmel patch only switches over to the register_all helper. -Daniel
On Tue, Mar 29, 2016 at 02:21:38PM +0200, Daniel Vetter wrote: > Accidentally fell through the cracks in > > commit 6c87e5c3ec6db052f3744804a517b6fb003906e1 > Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com> > Date: Wed Mar 23 11:42:54 2016 +0300 > > drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() > > despite that Boris acked that patch. > > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: Alexey Brodkin <abrodkin@synopsys.com> > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 3d8d16402d07..8ab4318e57a1 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -615,7 +615,7 @@ err: > static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev) > { > mutex_lock(&dev->mode_config.mutex); > - drm_connector_unplug_all(dev); > + drm_connector_unregister_all(dev); > mutex_unlock(&dev->mode_config.mutex); > } > I think the locking here is completely unnecessary, since drm_connector_unregister_all() doesn't actually do anything with the connector object as far as DRM device is concerned, it merely removes it from sysfs and debugfs. But given that I sent out almost the same patch earlier, and this does fix a build failure: Reviewed-by: Thierry Reding <treding@nvidia.com>
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 3d8d16402d07..8ab4318e57a1 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -615,7 +615,7 @@ err: static void atmel_hlcdc_dc_connector_unplug_all(struct drm_device *dev) { mutex_lock(&dev->mode_config.mutex); - drm_connector_unplug_all(dev); + drm_connector_unregister_all(dev); mutex_unlock(&dev->mode_config.mutex); }
Accidentally fell through the cracks in commit 6c87e5c3ec6db052f3744804a517b6fb003906e1 Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com> Date: Wed Mar 23 11:42:54 2016 +0300 drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() despite that Boris acked that patch. Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Alexey Brodkin <abrodkin@synopsys.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)