Merge "disp: msm: dsi: Remove drm_panel tracking from sde_connector"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
3e7ef1e1d0
@@ -812,14 +812,6 @@ int dsi_connector_get_modes(struct drm_connector *connector, void *data,
|
|||||||
|
|
||||||
memcpy(&edid, edid_buf, edid_size);
|
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);
|
rc = dsi_display_get_mode_count(display, &count);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
pr_err("failed to get num of modes, rc=%d\n", rc);
|
pr_err("failed to get num of modes, rc=%d\n", rc);
|
||||||
|
@@ -2450,7 +2450,6 @@ struct drm_connector *sde_connector_init(struct drm_device *dev,
|
|||||||
|
|
||||||
c_conn->connector_type = connector_type;
|
c_conn->connector_type = connector_type;
|
||||||
c_conn->encoder = encoder;
|
c_conn->encoder = encoder;
|
||||||
c_conn->panel = panel;
|
|
||||||
c_conn->display = display;
|
c_conn->display = display;
|
||||||
|
|
||||||
c_conn->dpms_mode = DRM_MODE_DPMS_ON;
|
c_conn->dpms_mode = DRM_MODE_DPMS_ON;
|
||||||
|
@@ -410,7 +410,6 @@ struct sde_connector {
|
|||||||
int connector_type;
|
int connector_type;
|
||||||
|
|
||||||
struct drm_encoder *encoder;
|
struct drm_encoder *encoder;
|
||||||
struct drm_panel *panel;
|
|
||||||
void *display;
|
void *display;
|
||||||
void *drv_panel;
|
void *drv_panel;
|
||||||
void *mst_port;
|
void *mst_port;
|
||||||
@@ -472,14 +471,6 @@ struct sde_connector {
|
|||||||
#define sde_connector_get_display(C) \
|
#define sde_connector_get_display(C) \
|
||||||
((C) ? to_sde_connector((C))->display : NULL)
|
((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
|
* sde_connector_get_encoder - get sde connector's private encoder pointer
|
||||||
* @C: Pointer to drm connector structure
|
* @C: Pointer to drm connector structure
|
||||||
|
Reference in New Issue
Block a user