Commit f26b8035 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/mdp4: move move_valid callback to lcdc_encoder 



We can check the LCDC clock directly from the LCDC encoder driver, so
remove it from the LVDS connector.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/650285/
Link: https://lore.kernel.org/r/20250425-fd-mdp4-lvds-v4-5-6b212160b44c@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent b641bf53

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, 
long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate);

struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev);



long mdp4_lcdc_round_pixclk(struct drm_encoder *encoder, unsigned long rate);

struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev,

		struct device_node *panel_node);

drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c

+20 −7
Original line number Diff line number Diff line
@@ -348,19 +348,32 @@ static void mdp4_lcdc_encoder_enable(struct drm_encoder *encoder) 
	mdp4_lcdc_encoder->enabled = true;

}



static enum drm_mode_status

mdp4_lcdc_encoder_mode_valid(struct drm_encoder *encoder,

		const struct drm_display_mode *mode)

{

	struct mdp4_lcdc_encoder *mdp4_lcdc_encoder =

			to_mdp4_lcdc_encoder(encoder);

	long actual, requested;



	requested = 1000 * mode->clock;

	actual = clk_round_rate(mdp4_lcdc_encoder->lcdc_clk, requested);



	DBG("requested=%ld, actual=%ld", requested, actual);



	if (actual != requested)

		return MODE_CLOCK_RANGE;



	return MODE_OK;

}



static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_funcs = {

	.mode_set = mdp4_lcdc_encoder_mode_set,

	.disable = mdp4_lcdc_encoder_disable,

	.enable = mdp4_lcdc_encoder_enable,

	.mode_valid = mdp4_lcdc_encoder_mode_valid,

};



long mdp4_lcdc_round_pixclk(struct drm_encoder *encoder, unsigned long rate)

{

	struct mdp4_lcdc_encoder *mdp4_lcdc_encoder =

			to_mdp4_lcdc_encoder(encoder);

	return clk_round_rate(mdp4_lcdc_encoder->lcdc_clk, rate);

}



/* initialize encoder */

struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev,

		struct device_node *panel_node)

drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c

+0 −21
Original line number Diff line number Diff line
@@ -56,26 +56,6 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector) 
	return ret;

}



static enum drm_mode_status

mdp4_lvds_connector_mode_valid(struct drm_connector *connector,

			       const struct drm_display_mode *mode)

{

	struct mdp4_lvds_connector *mdp4_lvds_connector =

			to_mdp4_lvds_connector(connector);

	struct drm_encoder *encoder = mdp4_lvds_connector->encoder;

	long actual, requested;



	requested = 1000 * mode->clock;

	actual = mdp4_lcdc_round_pixclk(encoder, requested);



	DBG("requested=%ld, actual=%ld", requested, actual);



	if (actual != requested)

		return MODE_CLOCK_RANGE;



	return MODE_OK;

}



static const struct drm_connector_funcs mdp4_lvds_connector_funcs = {

	.detect = mdp4_lvds_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -87,7 +67,6 @@ static const struct drm_connector_funcs mdp4_lvds_connector_funcs = { 


static const struct drm_connector_helper_funcs mdp4_lvds_connector_helper_funcs = {

	.get_modes = mdp4_lvds_connector_get_modes,

	.mode_valid = mdp4_lvds_connector_mode_valid,

};



/* initialize connector */