Commit 9625bf55 authored by Boris Brezillon's avatar Boris Brezillon Committed by Daniel Vetter
Browse files

drm: sti: Rely on the default ->best_encoder() behavior 



All outputs have a 1:1 relationship between connectors and encoders
and the driver is relying on the atomic helpers: we can drop the custom
->best_encoder() implementations and let the core call
drm_atomic_helper_best_encoder() for us.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-12-git-send-email-boris.brezillon@free-electrons.com
parent 797ef746

drivers/gpu/drm/sti/sti_dvo.c

+0 −10
Original line number Diff line number Diff line
@@ -377,20 +377,10 @@ static int sti_dvo_connector_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



struct drm_encoder *sti_dvo_best_encoder(struct drm_connector *connector)

{

	struct sti_dvo_connector *dvo_connector

		= to_sti_dvo_connector(connector);



	/* Best encoder is the one associated during connector creation */

	return dvo_connector->encoder;

}



static const

struct drm_connector_helper_funcs sti_dvo_connector_helper_funcs = {

	.get_modes = sti_dvo_connector_get_modes,

	.mode_valid = sti_dvo_connector_mode_valid,

	.best_encoder = sti_dvo_best_encoder,

};



static enum drm_connector_status

drivers/gpu/drm/sti/sti_hda.c

+0 −10
Original line number Diff line number Diff line
@@ -669,20 +669,10 @@ static int sti_hda_connector_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



struct drm_encoder *sti_hda_best_encoder(struct drm_connector *connector)

{

	struct sti_hda_connector *hda_connector

		= to_sti_hda_connector(connector);



	/* Best encoder is the one associated during connector creation */

	return hda_connector->encoder;

}



static const

struct drm_connector_helper_funcs sti_hda_connector_helper_funcs = {

	.get_modes = sti_hda_connector_get_modes,

	.mode_valid = sti_hda_connector_mode_valid,

	.best_encoder = sti_hda_best_encoder,

};



static enum drm_connector_status

drivers/gpu/drm/sti/sti_hdmi.c

+0 −10
Original line number Diff line number Diff line
@@ -890,20 +890,10 @@ static int sti_hdmi_connector_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



struct drm_encoder *sti_hdmi_best_encoder(struct drm_connector *connector)

{

	struct sti_hdmi_connector *hdmi_connector

		= to_sti_hdmi_connector(connector);



	/* Best encoder is the one associated during connector creation */

	return hdmi_connector->encoder;

}



static const

struct drm_connector_helper_funcs sti_hdmi_connector_helper_funcs = {

	.get_modes = sti_hdmi_connector_get_modes,

	.mode_valid = sti_hdmi_connector_mode_valid,

	.best_encoder = sti_hdmi_best_encoder,

};



/* get detection status of display device */

CRA Git | Maintained and supported by SUSTech CRA and CCSE