Skip to content

Commit

Permalink
drm/msm/dp: signal the hotplug disconnect in the event handler
Browse files Browse the repository at this point in the history
Signal the hotplug disconnect event to the audio side in the
event handler so that they are notified earlier and have more
time to process the disconnect event.

Changes in v2: none
Changes in v3: none
Changes in v4: rebase on top of latest patchset of dependency
Changes in v5: rebase on top of latest patchset of dependency
Changes in v6: none

Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
  • Loading branch information
Abhinav Kumar authored and Rob Clark committed Sep 15, 2020
1 parent a1f5bda commit bf4a1b3
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/gpu/drm/msm/dp/dp_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,13 @@ static int dp_connect_pending_timeout(struct dp_display_private *dp, u32 data)
return 0;
}

static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
bool plugged)
{
if (dp_display->plugged_cb && dp_display->codec_dev)
dp_display->plugged_cb(dp_display->codec_dev, plugged);
}

static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data)
{
struct dp_usbpd *hpd = dp->usbpd;
Expand Down Expand Up @@ -590,6 +597,9 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data)
/* start sanity checking */
dp_add_event(dp, EV_DISCONNECT_PENDING_TIMEOUT, 0, DP_TIMEOUT_5_SECOND);

/* signal the disconnect event early to ensure proper teardown */
dp_display_handle_plugged_change(g_dp_display, false);

dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_PLUG_INT_MASK |
DP_DP_IRQ_HPD_INT_MASK, true);

Expand Down Expand Up @@ -780,13 +790,6 @@ static int dp_display_prepare(struct msm_dp *dp)
return 0;
}

static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
bool plugged)
{
if (dp_display->plugged_cb && dp_display->codec_dev)
dp_display->plugged_cb(dp_display->codec_dev, plugged);
}

static int dp_display_enable(struct dp_display_private *dp, u32 data)
{
int rc = 0;
Expand Down Expand Up @@ -1371,8 +1374,6 @@ int msm_dp_display_pre_disable(struct msm_dp *dp, struct drm_encoder *encoder)

dp_ctrl_push_idle(dp_display->ctrl);

dp_display_handle_plugged_change(dp, false);

return 0;
}

Expand Down

0 comments on commit bf4a1b3

Please sign in to comment.