diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-07-03 12:56:03 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2018-08-09 17:19:51 +0200 |
| commit | 6c6d41412a78ae629b3af3f11ff5d8ff6230dcc2 (patch) | |
| tree | 9de1d29d86f0f2b101a66f7fdd6721b5324f451a | |
| parent | 2b18d73ed18118964f1e7bcbf0764abcd1d8b7f3 (diff) | |
| download | renesas-backport-6c6d41412a78ae629b3af3f11ff5d8ff6230dcc2.tar.gz | |
drm/bridge: adv7511: Reset registers on hotplug
The bridge loses its hw state when the cable is unplugged. If we detect
this case in the hpd handler, reset its state.
Reported-by: Rob Clark <robdclark@gmail.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180703165648.120401-1-seanpaul@chromium.org
(cherry picked from commit 5f3417569165a8ee57654217f73e0160312f409c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 73021b388e12d..dd3ff2f2cdce0 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -429,6 +429,18 @@ static void adv7511_hpd_work(struct work_struct *work) else status = connector_status_disconnected; + /* + * The bridge resets its registers on unplug. So when we get a plug + * event and we're already supposed to be powered, cycle the bridge to + * restore its state. + */ + if (status == connector_status_connected && + adv7511->connector.status == connector_status_disconnected && + adv7511->powered) { + regcache_mark_dirty(adv7511->regmap); + adv7511_power_on(adv7511); + } + if (adv7511->connector.status != status) { adv7511->connector.status = status; if (status == connector_status_disconnected) |