* [PATCH 1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero()
2023-09-06 18:12 [PATCH 0/2] drm/msm/dp: More DPCD cleanups Stephen Boyd
@ 2023-09-06 18:12 ` Stephen Boyd
2023-10-05 22:41 ` Dmitry Baryshkov
2023-09-06 18:12 ` [PATCH 2/2] drm/msm/dp: Remove error message when downstream port not connected Stephen Boyd
2023-10-08 14:01 ` [PATCH 0/2] drm/msm/dp: More DPCD cleanups Dmitry Baryshkov
2 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2023-09-06 18:12 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Dmitry Baryshkov
Cc: linux-kernel, patches, Sean Paul, dri-devel, freedreno,
Vinod Polimera, Kuogee Hsieh
This function is basically a one-liner when you ignore the debug
logging. Just inline the function and drop the log to simplify the code.
Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Vinod Polimera <quic_vpolimer@quicinc.com>
Cc: Kuogee Hsieh <quic_khsieh@quicinc.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/gpu/drm/msm/dp/dp_display.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 96bbf6fec2f1..2a5f1ab9a65b 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -341,14 +341,6 @@ static const struct component_ops dp_display_comp_ops = {
.unbind = dp_display_unbind,
};
-static bool dp_display_is_sink_count_zero(struct dp_display_private *dp)
-{
- drm_dbg_dp(dp->drm_dev, "present=%#x sink_count=%d\n",
- dp->panel->dpcd[DP_DOWNSTREAMPORT_PRESENT],
- dp->link->sink_count);
- return drm_dp_is_branch(dp->panel->dpcd) && dp->link->sink_count == 0;
-}
-
static void dp_display_send_hpd_event(struct msm_dp *dp_display)
{
struct dp_display_private *dp;
@@ -507,7 +499,7 @@ static int dp_display_handle_port_ststus_changed(struct dp_display_private *dp)
{
int rc = 0;
- if (dp_display_is_sink_count_zero(dp)) {
+ if (drm_dp_is_branch(dp->panel->dpcd) && dp->link->sink_count == 0) {
drm_dbg_dp(dp->drm_dev, "sink count is zero, nothing to do\n");
if (dp->hpd_state != ST_DISCONNECTED) {
dp->hpd_state = ST_DISCONNECT_PENDING;
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero()
2023-09-06 18:12 ` [PATCH 1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero() Stephen Boyd
@ 2023-10-05 22:41 ` Dmitry Baryshkov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-10-05 22:41 UTC (permalink / raw)
To: Stephen Boyd, Rob Clark, Abhinav Kumar
Cc: linux-kernel, patches, Sean Paul, dri-devel, freedreno,
Vinod Polimera, Kuogee Hsieh
On 06/09/2023 21:12, Stephen Boyd wrote:
> This function is basically a one-liner when you ignore the debug
> logging. Just inline the function and drop the log to simplify the code.
>
> Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Vinod Polimera <quic_vpolimer@quicinc.com>
> Cc: Kuogee Hsieh <quic_khsieh@quicinc.com>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/msm/dp: Remove error message when downstream port not connected
2023-09-06 18:12 [PATCH 0/2] drm/msm/dp: More DPCD cleanups Stephen Boyd
2023-09-06 18:12 ` [PATCH 1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero() Stephen Boyd
@ 2023-09-06 18:12 ` Stephen Boyd
2023-10-05 22:42 ` Dmitry Baryshkov
2023-10-08 14:01 ` [PATCH 0/2] drm/msm/dp: More DPCD cleanups Dmitry Baryshkov
2 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2023-09-06 18:12 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Dmitry Baryshkov
Cc: linux-kernel, patches, Sean Paul, dri-devel, freedreno,
Vinod Polimera, Kuogee Hsieh
Plugging in an Apple dongle without the HDMI cable attached prints out
an error message in the kernel logs when nothing is actually wrong.
no downstream ports connected
This is because the downstream port for the HDMI connector is not
connected, so the Apple dongle reports that as a zero sink count device.
Cc: Vinod Polimera <quic_vpolimer@quicinc.com>
Cc: Kuogee Hsieh <quic_khsieh@quicinc.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/gpu/drm/msm/dp/dp_panel.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index 97ba41593820..ae778e1a6fd0 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -156,7 +156,6 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
if (drm_dp_is_branch(dp_panel->dpcd)) {
count = drm_dp_read_sink_count(panel->aux);
if (!count) {
- DRM_ERROR("no downstream ports connected\n");
panel->link->sink_count = 0;
return -ENOTCONN;
}
--
https://chromeos.dev
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] drm/msm/dp: Remove error message when downstream port not connected
2023-09-06 18:12 ` [PATCH 2/2] drm/msm/dp: Remove error message when downstream port not connected Stephen Boyd
@ 2023-10-05 22:42 ` Dmitry Baryshkov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-10-05 22:42 UTC (permalink / raw)
To: Stephen Boyd, Rob Clark, Abhinav Kumar
Cc: linux-kernel, patches, Sean Paul, dri-devel, freedreno,
Vinod Polimera, Kuogee Hsieh
On 06/09/2023 21:12, Stephen Boyd wrote:
> Plugging in an Apple dongle without the HDMI cable attached prints out
> an error message in the kernel logs when nothing is actually wrong.
>
> no downstream ports connected
>
> This is because the downstream port for the HDMI connector is not
> connected, so the Apple dongle reports that as a zero sink count device.
>
> Cc: Vinod Polimera <quic_vpolimer@quicinc.com>
> Cc: Kuogee Hsieh <quic_khsieh@quicinc.com>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> drivers/gpu/drm/msm/dp/dp_panel.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index 97ba41593820..ae778e1a6fd0 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -156,7 +156,6 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
> if (drm_dp_is_branch(dp_panel->dpcd)) {
> count = drm_dp_read_sink_count(panel->aux);
> if (!count) {
> - DRM_ERROR("no downstream ports connected\n");
Maybe this can be converted to drm_dbg_dp?
> panel->link->sink_count = 0;
> return -ENOTCONN;
> }
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] drm/msm/dp: More DPCD cleanups
2023-09-06 18:12 [PATCH 0/2] drm/msm/dp: More DPCD cleanups Stephen Boyd
2023-09-06 18:12 ` [PATCH 1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero() Stephen Boyd
2023-09-06 18:12 ` [PATCH 2/2] drm/msm/dp: Remove error message when downstream port not connected Stephen Boyd
@ 2023-10-08 14:01 ` Dmitry Baryshkov
2 siblings, 0 replies; 6+ messages in thread
From: Dmitry Baryshkov @ 2023-10-08 14:01 UTC (permalink / raw)
To: Rob Clark, Abhinav Kumar, Stephen Boyd
Cc: linux-kernel, patches, Sean Paul, dri-devel, freedreno
On Wed, 06 Sep 2023 11:12:24 -0700, Stephen Boyd wrote:
> This is a follow-on to this series[1]. I can resend the whole pile if
> desired.
>
> [1] https://lore.kernel.org/r/20230829184735.2841739-1-swboyd@chromium.org
>
> Stephen Boyd (2):
> drm/msm/dp: Inline dp_display_is_sink_count_zero()
> drm/msm/dp: Remove error message when downstream port not connected
>
> [...]
Applied, thanks!
[1/2] drm/msm/dp: Inline dp_display_is_sink_count_zero()
https://gitlab.freedesktop.org/lumag/msm/-/commit/fb48250ca919
[2/2] drm/msm/dp: Remove error message when downstream port not connected
https://gitlab.freedesktop.org/lumag/msm/-/commit/e117fd68f973
Best regards,
--
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread