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

drm: i915: Rely on the default ->best_encoder() behavior where appropriate 



For all outputs except dp_mst, we 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() implementation and let the core
call drm_atomic_helper_best_encoder() for us.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-7-git-send-email-boris.brezillon@free-electrons.com
parent 5b809074

drivers/gpu/drm/i915/intel_crt.c

+0 −1
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {

	.mode_valid = intel_crt_mode_valid,

	.get_modes = intel_crt_get_modes,

	.best_encoder = intel_best_encoder,

};



static const struct drm_encoder_funcs intel_crt_enc_funcs = {

drivers/gpu/drm/i915/intel_display.c

+0 −8
Original line number Diff line number Diff line
@@ -16267,14 +16267,6 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	intel_teardown_gmbus(dev);

}



/*

 * Return which encoder is currently attached for connector.

 */

struct drm_encoder *intel_best_encoder(struct drm_connector *connector)

{

	return &intel_attached_encoder(connector)->base;

}



void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder)

{

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -4580,7 +4580,6 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { 
static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = {

	.get_modes = intel_dp_get_modes,

	.mode_valid = intel_dp_mode_valid,

	.best_encoder = intel_best_encoder,

};



static const struct drm_encoder_funcs intel_dp_enc_funcs = {

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,6 @@ struct intel_connector *intel_connector_alloc(void); 
bool intel_connector_get_hw_state(struct intel_connector *connector);

void intel_connector_attach_encoder(struct intel_connector *connector,

				    struct intel_encoder *encoder);

struct drm_encoder *intel_best_encoder(struct drm_connector *connector);

struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,

					     struct drm_crtc *crtc);

enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);

drivers/gpu/drm/i915/intel_dsi.c

+0 −1
Original line number Diff line number Diff line
@@ -1379,7 +1379,6 @@ static const struct drm_encoder_funcs intel_dsi_funcs = { 
static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {

	.get_modes = intel_dsi_get_modes,

	.mode_valid = intel_dsi_mode_valid,

	.best_encoder = intel_best_encoder,

};



static const struct drm_connector_funcs intel_dsi_connector_funcs = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE