Message ID | 1480410283-28698-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Geert Uytterhoeven |
Headers | show |
On Tue, Nov 29, 2016 at 11:04:34AM +0200, Laurent Pinchart wrote: > Most drivers that use bridges forgot to detach them at cleanup time. > Instead of fixing them one by one, detach the bridge in the core > drm_encoder_cleanup() function. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/gpu/drm/drm_encoder.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > index 5c067719164d..9c1f99646e0d 100644 > --- a/drivers/gpu/drm/drm_encoder.c > +++ b/drivers/gpu/drm/drm_encoder.c > @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > * the indices on the drm_encoder after us in the encoder_list. > */ > > + if (encoder->bridge) > + drm_bridge_detach(encoder->bridge); Means we bake in drm_bridge much more as a core thing, but I guess that's ok. But there's 3 callers of drm_bridge_detach outside of the drm core, can't we remove them and drop the EXPORT_SYMBOL for drm_bridge_detach? What's it still needed for? I think that cleanup should done in this patch here - drm_bridge_detach WARN_ONs if the bridge is already detached ... -Daniel > + > drm_modeset_lock_all(dev); > drm_mode_object_unregister(dev, &encoder->base); > kfree(encoder->name); > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 11/29/2016 02:34 PM, Laurent Pinchart wrote: > Most drivers that use bridges forgot to detach them at cleanup time. > Instead of fixing them one by one, detach the bridge in the core > drm_encoder_cleanup() function. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/gpu/drm/drm_encoder.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > index 5c067719164d..9c1f99646e0d 100644 > --- a/drivers/gpu/drm/drm_encoder.c > +++ b/drivers/gpu/drm/drm_encoder.c > @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > * the indices on the drm_encoder after us in the encoder_list. > */ > > + if (encoder->bridge) > + drm_bridge_detach(encoder->bridge); This would require the kms driver to still detach the remaining n - 1 bridges in a possible chain. We could probably detach all of them here, or maybe leave detaching of all to the kms driver, and just report a warning here. Archit > + > drm_modeset_lock_all(dev); > drm_mode_object_unregister(dev, &encoder->base); > kfree(encoder->name); >
Hi Archit, On Tuesday 29 Nov 2016 16:04:08 Archit Taneja wrote: > On 11/29/2016 02:34 PM, Laurent Pinchart wrote: > > Most drivers that use bridges forgot to detach them at cleanup time. > > Instead of fixing them one by one, detach the bridge in the core > > drm_encoder_cleanup() function. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > drivers/gpu/drm/drm_encoder.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > > index 5c067719164d..9c1f99646e0d 100644 > > --- a/drivers/gpu/drm/drm_encoder.c > > +++ b/drivers/gpu/drm/drm_encoder.c > > @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > > * the indices on the drm_encoder after us in the encoder_list. > > */ > > + if (encoder->bridge) > > + drm_bridge_detach(encoder->bridge); > > This would require the kms driver to still detach the remaining > n - 1 bridges in a possible chain. We could probably detach all of > them here, or maybe leave detaching of all to the kms driver, and just > report a warning here. I'd prefer detaching them all here, but that's a bit intrusive and should be tested correctly. The patch series is already growing big, could we do that in a separate patch ? > > + > > > > drm_modeset_lock_all(dev); > > drm_mode_object_unregister(dev, &encoder->base); > > kfree(encoder->name);
Hi Daniel, On Tuesday 29 Nov 2016 10:48:21 Daniel Vetter wrote: > On Tue, Nov 29, 2016 at 11:04:34AM +0200, Laurent Pinchart wrote: > > Most drivers that use bridges forgot to detach them at cleanup time. > > Instead of fixing them one by one, detach the bridge in the core > > drm_encoder_cleanup() function. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > drivers/gpu/drm/drm_encoder.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > > index 5c067719164d..9c1f99646e0d 100644 > > --- a/drivers/gpu/drm/drm_encoder.c > > +++ b/drivers/gpu/drm/drm_encoder.c > > @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > > > > * the indices on the drm_encoder after us in the encoder_list. > > */ > > > > + if (encoder->bridge) > > + drm_bridge_detach(encoder->bridge); > > Means we bake in drm_bridge much more as a core thing, but I guess that's > ok. > > But there's 3 callers of drm_bridge_detach outside of the drm core, can't > we remove them and drop the EXPORT_SYMBOL for drm_bridge_detach? What's > it still needed for? Agreed, I'll fix that. > I think that cleanup should done in this patch here - drm_bridge_detach > WARN_ONs if the bridge is already detached ... > > > + > > drm_modeset_lock_all(dev); > > drm_mode_object_unregister(dev, &encoder->base); > > kfree(encoder->name);
On Tue, Nov 29, 2016 at 08:56:44PM +0200, Laurent Pinchart wrote: > Hi Archit, > > On Tuesday 29 Nov 2016 16:04:08 Archit Taneja wrote: > > On 11/29/2016 02:34 PM, Laurent Pinchart wrote: > > > Most drivers that use bridges forgot to detach them at cleanup time. > > > Instead of fixing them one by one, detach the bridge in the core > > > drm_encoder_cleanup() function. > > > > > > Signed-off-by: Laurent Pinchart > > > <laurent.pinchart+renesas@ideasonboard.com> > > > --- > > > > > > drivers/gpu/drm/drm_encoder.c | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > > > index 5c067719164d..9c1f99646e0d 100644 > > > --- a/drivers/gpu/drm/drm_encoder.c > > > +++ b/drivers/gpu/drm/drm_encoder.c > > > @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > > > * the indices on the drm_encoder after us in the encoder_list. > > > */ > > > + if (encoder->bridge) > > > + drm_bridge_detach(encoder->bridge); > > > > This would require the kms driver to still detach the remaining > > n - 1 bridges in a possible chain. We could probably detach all of > > them here, or maybe leave detaching of all to the kms driver, and just > > report a warning here. > > I'd prefer detaching them all here, but that's a bit intrusive and should be > tested correctly. The patch series is already growing big, could we do that in > a separate patch ? I think you're bridge-for-panels driver is the first one that's actually getting chained. I guess you do have to fix this here ;-) And if you go through with making drm_bridge_detach be a purely drm.ko internal thing, we can make it recursive like all the other functions. Problem solved. -Daniel
diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c index 5c067719164d..9c1f99646e0d 100644 --- a/drivers/gpu/drm/drm_encoder.c +++ b/drivers/gpu/drm/drm_encoder.c @@ -164,6 +164,9 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) * the indices on the drm_encoder after us in the encoder_list. */ + if (encoder->bridge) + drm_bridge_detach(encoder->bridge); + drm_modeset_lock_all(dev); drm_mode_object_unregister(dev, &encoder->base); kfree(encoder->name);
Most drivers that use bridges forgot to detach them at cleanup time. Instead of fixing them one by one, detach the bridge in the core drm_encoder_cleanup() function. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/drm_encoder.c | 3 +++ 1 file changed, 3 insertions(+)