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

Commit 8d44d24c authored by Saikumar's avatar Saikumar
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  drm/msm/shd: correct base connector state at lastclose
  ARM: dts: msm: add support for default topology for visionox panel
  drm: msm: update vsync source for sde rsc
  ARM: dts: msm: remove qdss offset for trinket
  disp: msm: hdcp: force encryption for HDCP 1.3 compliance
  drm/msm/shd: add display-type support in shared display
  drm/msm/sde: change backlight setup to support shared dsi display
  drm/msm/shd: fix issue when clearing blend stages
  drm/msm/dsi-staging: decouple label and display type for DSI

Change-Id: I57ab33537eb465bd67b1a77c0ce359cb532ba35a
Signed-off-by: default avatarSaikumar <saikk@codeaurora.org>
parent 65119ded

arch/arm64/boot/dts/qcom/sdmmagpie-sde-display.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ 
			qcom,mdss-dsi-panel-phy-timings = [00 20 08 08 24 23 08

				08 05 02 04 00];

			qcom,display-topology = <1 0 1>;

			qcom,default-topology-index = <0>;

		};

	};

};

drivers/gpu/drm/msm/dp/dp_display.c

+2 −1
Original line number Diff line number Diff line
@@ -401,7 +401,8 @@ static void dp_display_hdcp_cb_work(struct work_struct *work) 


	dp_display_update_hdcp_status(dp, false);



	if (dp->debug->force_encryption && ops && ops->force_encryption)

	if (status->hdcp_state != HDCP_STATE_AUTHENTICATED &&

		dp->debug->force_encryption && ops && ops->force_encryption)

		ops->force_encryption(data, dp->debug->force_encryption);



	switch (status->hdcp_state) {

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

+4 −14
Original line number Diff line number Diff line
@@ -3648,7 +3648,7 @@ static int dsi_display_res_init(struct dsi_display *display) 
	display->panel = dsi_panel_get(&display->pdev->dev,

				display->panel_of,

				display->parser_node,

				display->display_type,

				display->dsi_type,

				display->cmdline_topology);

	if (IS_ERR_OR_NULL(display->panel)) {

		rc = PTR_ERR(display->panel);
@@ -5271,7 +5271,6 @@ int dsi_display_dev_probe(struct platform_device *pdev) 


	for (i = 0; i < count; i++) {

		struct device_node *np;

		const char *disp_type = NULL;



		np = of_parse_phandle(node, disp_list, i);

		name = of_get_property(np, "label", NULL);
@@ -5280,16 +5279,6 @@ int dsi_display_dev_probe(struct platform_device *pdev) 
			continue;

		}



		disp_type = of_get_property(np, "qcom,display-type", NULL);

		if (!disp_type) {

			pr_err("display type not defined for %s\n", name);

			continue;

		}



		/* primary/secondary display should match with current dsi */

		if (strcmp(dsi_type, disp_type))

			continue;



		if (boot_disp->boot_disp_en) {

			if (!strcmp(boot_disp->name, name)) {

				disp_node = np;
@@ -5319,6 +5308,7 @@ int dsi_display_dev_probe(struct platform_device *pdev) 
	display->name = name;

	display->pdev = pdev;

	display->boot_disp = boot_disp;

	display->dsi_type = dsi_type;



	dsi_display_parse_cmdline_topology(display, index);
@@ -5545,7 +5535,7 @@ static int dsi_display_ext_get_info(struct drm_connector *connector, 


	info->is_connected = connector->status != connector_status_disconnected;



	if (!strcmp(display->display_type, "primary"))

	if (!strcmp(display->dsi_type, "primary"))

		info->is_primary = true;

	else

		info->is_primary = false;
@@ -5901,7 +5891,7 @@ int dsi_display_get_info(struct drm_connector *connector, 
	info->is_connected = true;

	info->is_primary = false;



	if (!strcmp(display->display_type, "primary"))

	if (!strcmp(display->dsi_type, "primary"))

		info->is_primary = true;



	info->width_mm = phy_props.panel_width_mm;

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

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ struct dsi_display_ext_bridge { 
 * @ext_conn:         Pointer to external connector attached to DSI connector

 * @name:             Name of the display.

 * @display_type:     Display type as defined in device tree.

 * @dsi_type:         Display label as defined in device tree.

 * @list:             List pointer.

 * @is_active:        Is display active.

 * @is_cont_splash_enabled:  Is continuous splash enabled
@@ -196,6 +197,7 @@ struct dsi_display { 


	const char *name;

	const char *display_type;

	const char *dsi_type;

	struct list_head list;

	bool is_cont_splash_enabled;

	bool sw_te_using_wd;

drivers/gpu/drm/msm/sde/sde_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int sde_backlight_setup(struct sde_connector *c_conn, 
	if (!c_conn || !dev || !dev->dev) {

		SDE_ERROR("invalid param\n");

		return -EINVAL;

	} else if (c_conn->connector_type != DRM_MODE_CONNECTOR_DSI) {

	} else if (!c_conn->ops.set_backlight) {

		return 0;

	}