| Message ID | 20201103011023.21365-1-abhinavk@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e8c765811b1064c200829eacf237ac8c25e79cd0 |
| Headers | show |
| Series | [v2] drm/msm/dp: do not notify audio subsystem if sink doesn't support audio | expand |
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Mon, 2 Nov 2020 17:10:23 -0800 you wrote: > For sinks that do not support audio, there is no need to notify > audio subsystem of the connection event. > > This will make sure that audio routes only to the primary display > when connected to such sinks. > > changes in v2: > - Added fixes tag > - Removed nested if condition and removed usage of global pointer > > [...] Here is the summary with links: - [v2] drm/msm/dp: do not notify audio subsystem if sink doesn't support audio https://git.kernel.org/qcom/c/e8c765811b10 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 2f72817ca24f..3f59ba8fcde5 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -549,7 +549,14 @@ static int dp_connect_pending_timeout(struct dp_display_private *dp, u32 data) static void dp_display_handle_plugged_change(struct msm_dp *dp_display, bool plugged) { - if (dp_display->plugged_cb && dp_display->codec_dev) + struct dp_display_private *dp; + + dp = container_of(dp_display, + struct dp_display_private, dp_display); + + /* notify audio subsystem only if sink supports audio */ + if (dp_display->plugged_cb && dp_display->codec_dev && + dp->audio_supported) dp_display->plugged_cb(dp_display->codec_dev, plugged); }
For sinks that do not support audio, there is no need to notify audio subsystem of the connection event. This will make sure that audio routes only to the primary display when connected to such sinks. changes in v2: - Added fixes tag - Removed nested if condition and removed usage of global pointer Fixes: d13e36d7d222 ("drm/msm/dp: add audio support for Display Port on MSM") Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> --- drivers/gpu/drm/msm/dp/dp_display.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)