Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 975f4aa2 authored by Chris Zhong's avatar Chris Zhong Committed by Sean Paul
Browse files

drm/rockchip/dsi: remove mode_valid function 



The MIPI DSI do not need check the validity of resolution, the max
resolution should depend VOP. Hence, remove rk3288_mipi_dsi_mode_valid
here.

Signed-off-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1487577744-2855-5-git-send-email-zyw@rock-chips.com
parent a432e054

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

+0 −39
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ struct dw_mipi_dsi_plat_data { 
	u32 grf_dsi0_mode;

	u32 grf_dsi0_mode_reg;

	unsigned int max_data_lanes;

	enum drm_mode_status (*mode_valid)(struct drm_connector *connector,

					   struct drm_display_mode *mode);

};



struct dw_mipi_dsi {
@@ -1041,23 +1039,8 @@ static int dw_mipi_dsi_connector_get_modes(struct drm_connector *connector) 
	return drm_panel_get_modes(dsi->panel);

}



static enum drm_mode_status dw_mipi_dsi_mode_valid(

					struct drm_connector *connector,

					struct drm_display_mode *mode)

{

	struct dw_mipi_dsi *dsi = con_to_dsi(connector);



	enum drm_mode_status mode_status = MODE_OK;



	if (dsi->pdata->mode_valid)

		mode_status = dsi->pdata->mode_valid(connector, mode);



	return mode_status;

}



static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = {

	.get_modes = dw_mipi_dsi_connector_get_modes,

	.mode_valid = dw_mipi_dsi_mode_valid,

};



static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector)
@@ -1128,33 +1111,11 @@ static int rockchip_mipi_parse_dt(struct dw_mipi_dsi *dsi) 
	return 0;

}



static enum drm_mode_status rk3288_mipi_dsi_mode_valid(

					struct drm_connector *connector,

					struct drm_display_mode *mode)

{

	/*

	 * The VID_PKT_SIZE field in the DSI_VID_PKT_CFG

	 * register is 11-bit.

	 */

	if (mode->hdisplay > 0x7ff)

		return MODE_BAD_HVALUE;



	/*

	 * The V_ACTIVE_LINES field in the DSI_VTIMING_CFG

	 * register is 11-bit.

	 */

	if (mode->vdisplay > 0x7ff)

		return MODE_BAD_VVALUE;



	return MODE_OK;

}



static struct dw_mipi_dsi_plat_data rk3288_mipi_dsi_drv_data = {

	.dsi0_en_bit = RK3288_DSI0_SEL_VOP_LIT,

	.dsi1_en_bit = RK3288_DSI1_SEL_VOP_LIT,

	.grf_switch_reg = RK3288_GRF_SOC_CON6,

	.max_data_lanes = 4,

	.mode_valid = rk3288_mipi_dsi_mode_valid,

};



static struct dw_mipi_dsi_plat_data rk3399_mipi_dsi_drv_data = {