| Message ID | 20160804095027.GB6232@phenom.ffwll.local (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, Aug 04, 2016 at 11:50:27AM +0200, Daniel Vetter wrote: > On Thu, Aug 04, 2016 at 12:02:23PM +0300, Jani Nikula wrote: > > On Tue, 12 Jul 2016, Daniel Vetter <daniel@ffwll.ch> wrote: > > > On Thu, Jun 30, 2016 at 12:30:56PM +0100, Chris Wilson wrote: > > >> Backlights controlled by i915.ko and only associated with its connectors > > >> and also only associated with the intel_drmfb fbcon, controlled by > > >> i915.ko. In this situation, we already handle adjusting the backlight > > >> when the fbcon is blanked/unblanked and do not require backlight trying > > >> to do the same. > > >> > > >> Attempting to register with the fbdev as a client causes lockdep to warn > > >> about a dependency cycle: > > > > > > The fbdev notifier strikes again! > > > > > > Last time I looked into this I think the proper solution would be to split > > > the backlight part from the other fbdev notifier (which is used by fbcon > > > for reacting to fbdev device reg/unreg events). > > > > > > I think that would fix this too, with the added bonus of slightly > > > untangling the fbcon locking mess. And it's also the one part of > > > untangling this mess which should be possible without any trouble - I've > > > simply never done it since entirely getting rid of the fbdev notifier for > > > fbcon is a lot more work. > > > > So what do we do with this? It fixes a problem upstream. There's no > > Fixes: to identify the bad commit. Any idea on that? It's either this or > > we dig out the bad commit (Chris probably knows which one?) and revert. > > The real trouble is the drm_for_each_connector in > drm_connector_register_all(). This introduced the new depency. The proper > fix imo is to fix up the connector_list locking, but for 4.8 we could do > the same hack+comment like we do in unregister_all. It's not the only > place that's broken anyway, and much less invasive than this here. You still have the underlying issue of multiple drivers trying to control the same piece of hardware, causing duplicate work (at best). -Chris
On Thu, Aug 04, 2016 at 10:57:29AM +0100, Chris Wilson wrote: > On Thu, Aug 04, 2016 at 11:50:27AM +0200, Daniel Vetter wrote: > > On Thu, Aug 04, 2016 at 12:02:23PM +0300, Jani Nikula wrote: > > > On Tue, 12 Jul 2016, Daniel Vetter <daniel@ffwll.ch> wrote: > > > > On Thu, Jun 30, 2016 at 12:30:56PM +0100, Chris Wilson wrote: > > > >> Backlights controlled by i915.ko and only associated with its connectors > > > >> and also only associated with the intel_drmfb fbcon, controlled by > > > >> i915.ko. In this situation, we already handle adjusting the backlight > > > >> when the fbcon is blanked/unblanked and do not require backlight trying > > > >> to do the same. > > > >> > > > >> Attempting to register with the fbdev as a client causes lockdep to warn > > > >> about a dependency cycle: > > > > > > > > The fbdev notifier strikes again! > > > > > > > > Last time I looked into this I think the proper solution would be to split > > > > the backlight part from the other fbdev notifier (which is used by fbcon > > > > for reacting to fbdev device reg/unreg events). > > > > > > > > I think that would fix this too, with the added bonus of slightly > > > > untangling the fbcon locking mess. And it's also the one part of > > > > untangling this mess which should be possible without any trouble - I've > > > > simply never done it since entirely getting rid of the fbdev notifier for > > > > fbcon is a lot more work. > > > > > > So what do we do with this? It fixes a problem upstream. There's no > > > Fixes: to identify the bad commit. Any idea on that? It's either this or > > > we dig out the bad commit (Chris probably knows which one?) and revert. > > > > The real trouble is the drm_for_each_connector in > > drm_connector_register_all(). This introduced the new depency. The proper > > fix imo is to fix up the connector_list locking, but for 4.8 we could do > > the same hack+comment like we do in unregister_all. It's not the only > > place that's broken anyway, and much less invasive than this here. > > You still have the underlying issue of multiple drivers trying to > control the same piece of hardware, causing duplicate work (at best). Yes, and the underlying issue of the fb backlight notifier being tangled up in everything else is also still there. But I think both are a bit too big to be tackled in an -rc (even if -rc1 isn't even there yet). I think we should try to get your patch in still for 4.9, and maybe we can trick someone into at least untangling the backlight stuff from the fb notifier at large. -Daniel
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index ef921fa09a84..c990fe9cc0cf 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -401,16 +401,13 @@ int drm_connector_register_all(struct drm_device *dev) struct drm_connector *connector; int ret; - mutex_lock(&dev->mode_config.mutex); - - drm_for_each_connector(connector, dev) { + /* FIXME: taking the mode config mutex ends up in a clash with sysfs */ + list_for_each_entry(connector, &dev->mode_config.connector_list, head) { ret = drm_connector_register(connector); if (ret) goto err; } - mutex_unlock(&dev->mode_config.mutex); - return 0; err: