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

Commit 79d80812 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: fix minimum fps calculation"

parents 6c3eb157 67736d31

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+4 −4
Original line number Diff line number Diff line
@@ -5458,13 +5458,13 @@ static void _dsi_display_populate_bit_clks(struct dsi_display *display, 
	cfg = &(display->panel->host_config);

	bpp = dsi_pixel_format_to_bpp(cfg->dst_format);



	if (cfg->data_lanes & DSI_LOGICAL_LANE_0)

	if (cfg->data_lanes & DSI_DATA_LANE_0)

		lanes++;

	if (cfg->data_lanes & DSI_LOGICAL_LANE_1)

	if (cfg->data_lanes & DSI_DATA_LANE_1)

		lanes++;

	if (cfg->data_lanes & DSI_LOGICAL_LANE_2)

	if (cfg->data_lanes & DSI_DATA_LANE_2)

		lanes++;

	if (cfg->data_lanes & DSI_LOGICAL_LANE_3)

	if (cfg->data_lanes & DSI_DATA_LANE_3)

		lanes++;



	dsi_display_get_mode_count_no_lock(display, &total_modes);

drivers/gpu/drm/msm/dsi-staging/dsi_drm.c

+2 −1
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ static void dsi_bridge_enable(struct drm_bridge *bridge) 
	}



	if (c_bridge->dsi_mode.dsi_mode_flags &

			(DSI_MODE_FLAG_SEAMLESS | DSI_MODE_FLAG_VRR)) {

			(DSI_MODE_FLAG_SEAMLESS | DSI_MODE_FLAG_VRR |

			 DSI_MODE_FLAG_DYN_CLK)) {

		pr_debug("[%d] seamless enable\n", c_bridge->id);

		return;

	}

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+4 −5
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static int dsi_panel_parse_dfps_caps(struct dsi_dfps_capabilities *dfps_caps, 
	int rc = 0;

	bool supported = false;

	const char *type;

	u32 val = 0, i;

	u32 i;



	supported = of_property_read_bool(of_node,

					"qcom,mdss-dsi-pan-enable-dynamic-fps");
@@ -1237,11 +1237,10 @@ static int dsi_panel_parse_dfps_caps(struct dsi_dfps_capabilities *dfps_caps, 
	dfps_caps->dfps_support = true;



	/* calculate max and min fps */

	of_property_read_u32(of_node, "qcom,mdss-dsi-panel-framerate", &val);

	dfps_caps->max_refresh_rate = val;

	dfps_caps->min_refresh_rate = val;

	dfps_caps->max_refresh_rate = dfps_caps->dfps_list[0];

	dfps_caps->min_refresh_rate = dfps_caps->dfps_list[0];



	for (i = 0; i < dfps_caps->dfps_list_len; i++) {

	for (i = 1; i < dfps_caps->dfps_list_len; i++) {

		if (dfps_caps->dfps_list[i] < dfps_caps->min_refresh_rate)

			dfps_caps->min_refresh_rate = dfps_caps->dfps_list[i];

		else if (dfps_caps->dfps_list[i] > dfps_caps->max_refresh_rate)