Skip to content

Commit

Permalink
drm/bridge: analogix_dp: Grab runtime PM reference for DP-AUX
Browse files Browse the repository at this point in the history
commit 8fb6c44 upstream.

If the display is not enable()d, then we aren't holding a runtime PM
reference here. Thus, it's easy to accidentally cause a hang, if user
space is poking around at /dev/drm_dp_aux0 at the "wrong" time.

Let's get a runtime PM reference, and check that we "see" the panel.
Don't force any panel power-up, etc., because that can be intrusive, and
that's not what other drivers do (see
drivers/gpu/drm/bridge/ti-sn65dsi86.c and
drivers/gpu/drm/bridge/parade-ps8640.c.)

Fixes: 0d97ad0 ("drm/bridge: analogix_dp: Remove duplicated code")
Cc: <stable@vger.kernel.org>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220301181107.v4.1.I773a08785666ebb236917b0c8e6c05e3de471e75@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
computersforpeace authored and gregkh committed Jun 9, 2022
1 parent 8e47968 commit cfd6c98
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
Expand Up @@ -1632,8 +1632,19 @@ static ssize_t analogix_dpaux_transfer(struct drm_dp_aux *aux,
struct drm_dp_aux_msg *msg)
{
struct analogix_dp_device *dp = to_dp(aux);
int ret;

pm_runtime_get_sync(dp->dev);

ret = analogix_dp_detect_hpd(dp);
if (ret)
goto out;

return analogix_dp_transfer(dp, msg);
ret = analogix_dp_transfer(dp, msg);
out:
pm_runtime_put(dp->dev);

return ret;
}

struct analogix_dp_device *
Expand Down

0 comments on commit cfd6c98

Please sign in to comment.