]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/atomic: Acquire connection_mutex lock in drm_helper_probe_single_connector_modes...
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 6 Apr 2017 18:55:20 +0000 (20:55 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 6 Apr 2017 19:29:23 +0000 (21:29 +0200)
commit6c5ed5ae353cdf156f9ac4db17e15db56b4de880
treed24402c7bef516de0f3ec69318606b67065954cb
parent99748ab64fcc857837acfd754b530487a490edb5
drm/atomic: Acquire connection_mutex lock in drm_helper_probe_single_connector_modes, v4.

mode_valid() called from drm_helper_probe_single_connector_modes()
may need to look at connector->state because what a valid mode is may
depend on connector properties being set. For example some HDMI modes
might be rejected when a connector property forces the connector
into DVI mode.

Some implementations of detect() already lock all state,
so we have to pass an acquire_ctx to them to prevent a deadlock.

This means changing the function signature of detect() slightly,
and passing the acquire_ctx for locking multiple crtc's.
For the callbacks, it will always be non-zero. To allow callers
not to worry about this, drm_helper_probe_detect_ctx is added
which might handle -EDEADLK for you.

Changes since v1:
- Always set ctx parameter.
Changes since v2:
- Always take connection_mutex when probing.
Changes since v3:
- Remove the ctx from intel_dp_long_pulse, and add
  WARN_ON(!connection_mutex) (danvet)
- Update docs to clarify the locking situation. (danvet)

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1491504920-4017-1-git-send-email-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_hotplug.c
drivers/gpu/drm/i915/intel_tv.c
include/drm/drm_connector.h
include/drm/drm_crtc_helper.h
include/drm/drm_modeset_helper_vtables.h