Message ID | 20220323103546.1772673-4-dmitry.baryshkov@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/msm/dp: simplify dp_connector_get_modes() | expand |
On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote: > Since the last commit, the max_pclk_khz became constant, it's set to > DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely > and use DP_MAX_PIXEL_CLK_KHZ directly. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com> > drivers/gpu/drm/msm/dp/dp_debug.c | 2 -- > drivers/gpu/drm/msm/dp/dp_display.c | 1 - > drivers/gpu/drm/msm/dp/dp_display.h | 2 -- > drivers/gpu/drm/msm/dp/dp_drm.c | 4 +--- > drivers/gpu/drm/msm/dp/dp_panel.h | 1 - > 5 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c > index 2f9c943f12d5..5e35033ba3e4 100644 > --- a/drivers/gpu/drm/msm/dp/dp_debug.c > +++ b/drivers/gpu/drm/msm/dp/dp_debug.c > @@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p) > drm_mode = &debug->panel->dp_mode.drm_mode; > > seq_printf(seq, "\tname = %s\n", DEBUG_NAME); > - seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n", > - debug->panel->max_pclk_khz); > seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n", > debug->panel->link_info.rate); > seq_printf(seq, "\t\tnum_lanes = %u\n", > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index be1e9c558fda..aeb08416b309 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) > dp->audio_supported = drm_detect_monitor_audio(edid); > dp_panel_handle_sink_request(dp->panel); > > - dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ; > dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes; > > /* > diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h > index 6efb5c853c89..f3a9d7449a1c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.h > +++ b/drivers/gpu/drm/msm/dp/dp_display.h > @@ -24,8 +24,6 @@ struct msm_dp { > > hdmi_codec_plugged_cb plugged_cb; > > - u32 max_pclk_khz; > - > u32 max_dp_lanes; > struct dp_audio *dp_audio; > }; > diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c > index af5f1b001192..a94c9b34f397 100644 > --- a/drivers/gpu/drm/msm/dp/dp_drm.c > +++ b/drivers/gpu/drm/msm/dp/dp_drm.c > @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid( > > dp_disp = to_dp_connector(connector)->dp_display; > > - if ((dp_disp->max_pclk_khz <= 0) || > - (dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) || > - (mode->clock > dp_disp->max_pclk_khz)) > + if (mode->clock > DP_MAX_PIXEL_CLK_KHZ) > return MODE_BAD; > > return dp_display_validate_mode(dp_disp, mode->clock); > diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h > index 9fa6e524832c..d861197ac1c8 100644 > --- a/drivers/gpu/drm/msm/dp/dp_panel.h > +++ b/drivers/gpu/drm/msm/dp/dp_panel.h > @@ -49,7 +49,6 @@ struct dp_panel { > bool video_test; > > u32 vic; > - u32 max_pclk_khz; > u32 max_dp_lanes; > > u32 max_bw_code;
Quoting Dmitry Baryshkov (2022-03-23 03:35:46) > Since the last commit, the max_pclk_khz became constant, it's set to > DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely > and use DP_MAX_PIXEL_CLK_KHZ directly. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> > diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c > index af5f1b001192..a94c9b34f397 100644 > --- a/drivers/gpu/drm/msm/dp/dp_drm.c > +++ b/drivers/gpu/drm/msm/dp/dp_drm.c > @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid( > > dp_disp = to_dp_connector(connector)->dp_display; > > - if ((dp_disp->max_pclk_khz <= 0) || > - (dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) || > - (mode->clock > dp_disp->max_pclk_khz)) > + if (mode->clock > DP_MAX_PIXEL_CLK_KHZ) > return MODE_BAD; Can we have a followup patch to return MODE_CLOCK_HIGH?
diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c index 2f9c943f12d5..5e35033ba3e4 100644 --- a/drivers/gpu/drm/msm/dp/dp_debug.c +++ b/drivers/gpu/drm/msm/dp/dp_debug.c @@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p) drm_mode = &debug->panel->dp_mode.drm_mode; seq_printf(seq, "\tname = %s\n", DEBUG_NAME); - seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n", - debug->panel->max_pclk_khz); seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n", debug->panel->link_info.rate); seq_printf(seq, "\t\tnum_lanes = %u\n", diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index be1e9c558fda..aeb08416b309 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) dp->audio_supported = drm_detect_monitor_audio(edid); dp_panel_handle_sink_request(dp->panel); - dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ; dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes; /* diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 6efb5c853c89..f3a9d7449a1c 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -24,8 +24,6 @@ struct msm_dp { hdmi_codec_plugged_cb plugged_cb; - u32 max_pclk_khz; - u32 max_dp_lanes; struct dp_audio *dp_audio; }; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index af5f1b001192..a94c9b34f397 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid( dp_disp = to_dp_connector(connector)->dp_display; - if ((dp_disp->max_pclk_khz <= 0) || - (dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) || - (mode->clock > dp_disp->max_pclk_khz)) + if (mode->clock > DP_MAX_PIXEL_CLK_KHZ) return MODE_BAD; return dp_display_validate_mode(dp_disp, mode->clock); diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h index 9fa6e524832c..d861197ac1c8 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.h +++ b/drivers/gpu/drm/msm/dp/dp_panel.h @@ -49,7 +49,6 @@ struct dp_panel { bool video_test; u32 vic; - u32 max_pclk_khz; u32 max_dp_lanes; u32 max_bw_code;
Since the last commit, the max_pclk_khz became constant, it's set to DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely and use DP_MAX_PIXEL_CLK_KHZ directly. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/dp/dp_debug.c | 2 -- drivers/gpu/drm/msm/dp/dp_display.c | 1 - drivers/gpu/drm/msm/dp/dp_display.h | 2 -- drivers/gpu/drm/msm/dp/dp_drm.c | 4 +--- drivers/gpu/drm/msm/dp/dp_panel.h | 1 - 5 files changed, 1 insertion(+), 9 deletions(-)