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

Commit 3e7ef1e1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dsi: Remove drm_panel tracking from sde_connector"

parents a990883c cc9aa48d

msm/dsi/dsi_drm.c

+0 −8
Original line number Diff line number Diff line
@@ -812,14 +812,6 @@ int dsi_connector_get_modes(struct drm_connector *connector, void *data, 


	memcpy(&edid, edid_buf, edid_size);



	if (sde_connector_get_panel(connector)) {

		/*

		 * TODO: If drm_panel is attached, query modes from the panel.

		 * This is complicated in split dsi cases because panel is not

		 * attached to both connectors.

		 */

		goto end;

	}

	rc = dsi_display_get_mode_count(display, &count);

	if (rc) {

		pr_err("failed to get num of modes, rc=%d\n", rc);

msm/sde/sde_connector.c

+0 −1
Original line number Diff line number Diff line
@@ -2450,7 +2450,6 @@ struct drm_connector *sde_connector_init(struct drm_device *dev, 


	c_conn->connector_type = connector_type;

	c_conn->encoder = encoder;

	c_conn->panel = panel;

	c_conn->display = display;



	c_conn->dpms_mode = DRM_MODE_DPMS_ON;

msm/sde/sde_connector.h

+0 −9
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ struct sde_connector { 
	int connector_type;



	struct drm_encoder *encoder;

	struct drm_panel *panel;

	void *display;

	void *drv_panel;

	void *mst_port;
@@ -472,14 +471,6 @@ struct sde_connector { 
#define sde_connector_get_display(C) \

	((C) ? to_sde_connector((C))->display : NULL)



/**

 * sde_connector_get_panel - get sde connector's private panel pointer

 * @C: Pointer to drm connector structure

 * Returns: Pointer to associated private display structure

 */

#define sde_connector_get_panel(C) \

	((C) ? to_sde_connector((C))->panel : NULL)



/**

 * sde_connector_get_encoder - get sde connector's private encoder pointer

 * @C: Pointer to drm connector structure