mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1465300095-16971-7-git-send-email-boris.brezillon@free-electrons.com
This commit is contained in:
parent
5b8090747a
commit
cc22a86c26
10 changed files with 0 additions and 17 deletions
|
@ -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 = {
|
static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
|
||||||
.mode_valid = intel_crt_mode_valid,
|
.mode_valid = intel_crt_mode_valid,
|
||||||
.get_modes = intel_crt_get_modes,
|
.get_modes = intel_crt_get_modes,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_encoder_funcs intel_crt_enc_funcs = {
|
static const struct drm_encoder_funcs intel_crt_enc_funcs = {
|
||||||
|
|
|
@ -16267,14 +16267,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
|
||||||
intel_teardown_gmbus(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,
|
void intel_connector_attach_encoder(struct intel_connector *connector,
|
||||||
struct intel_encoder *encoder)
|
struct intel_encoder *encoder)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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 = {
|
static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = {
|
||||||
.get_modes = intel_dp_get_modes,
|
.get_modes = intel_dp_get_modes,
|
||||||
.mode_valid = intel_dp_mode_valid,
|
.mode_valid = intel_dp_mode_valid,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_encoder_funcs intel_dp_enc_funcs = {
|
static const struct drm_encoder_funcs intel_dp_enc_funcs = {
|
||||||
|
|
|
@ -1154,7 +1154,6 @@ struct intel_connector *intel_connector_alloc(void);
|
||||||
bool intel_connector_get_hw_state(struct intel_connector *connector);
|
bool intel_connector_get_hw_state(struct intel_connector *connector);
|
||||||
void intel_connector_attach_encoder(struct intel_connector *connector,
|
void intel_connector_attach_encoder(struct intel_connector *connector,
|
||||||
struct intel_encoder *encoder);
|
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_display_mode *intel_crtc_mode_get(struct drm_device *dev,
|
||||||
struct drm_crtc *crtc);
|
struct drm_crtc *crtc);
|
||||||
enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
|
enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
|
||||||
|
|
|
@ -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 = {
|
static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
|
||||||
.get_modes = intel_dsi_get_modes,
|
.get_modes = intel_dsi_get_modes,
|
||||||
.mode_valid = intel_dsi_mode_valid,
|
.mode_valid = intel_dsi_mode_valid,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
||||||
|
|
|
@ -351,7 +351,6 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = {
|
||||||
static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
|
static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
|
||||||
.mode_valid = intel_dvo_mode_valid,
|
.mode_valid = intel_dvo_mode_valid,
|
||||||
.get_modes = intel_dvo_get_modes,
|
.get_modes = intel_dvo_get_modes,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
|
static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
|
||||||
|
|
|
@ -1782,7 +1782,6 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
|
||||||
static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
|
static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
|
||||||
.get_modes = intel_hdmi_get_modes,
|
.get_modes = intel_hdmi_get_modes,
|
||||||
.mode_valid = intel_hdmi_mode_valid,
|
.mode_valid = intel_hdmi_mode_valid,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
|
static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
|
||||||
|
|
|
@ -547,7 +547,6 @@ static int intel_lvds_set_property(struct drm_connector *connector,
|
||||||
static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
|
static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
|
||||||
.get_modes = intel_lvds_get_modes,
|
.get_modes = intel_lvds_get_modes,
|
||||||
.mode_valid = intel_lvds_mode_valid,
|
.mode_valid = intel_lvds_mode_valid,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_connector_funcs intel_lvds_connector_funcs = {
|
static const struct drm_connector_funcs intel_lvds_connector_funcs = {
|
||||||
|
|
|
@ -2191,7 +2191,6 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
|
||||||
static const struct drm_connector_helper_funcs intel_sdvo_connector_helper_funcs = {
|
static const struct drm_connector_helper_funcs intel_sdvo_connector_helper_funcs = {
|
||||||
.get_modes = intel_sdvo_get_modes,
|
.get_modes = intel_sdvo_get_modes,
|
||||||
.mode_valid = intel_sdvo_mode_valid,
|
.mode_valid = intel_sdvo_mode_valid,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void intel_sdvo_enc_destroy(struct drm_encoder *encoder)
|
static void intel_sdvo_enc_destroy(struct drm_encoder *encoder)
|
||||||
|
|
|
@ -1512,7 +1512,6 @@ static const struct drm_connector_funcs intel_tv_connector_funcs = {
|
||||||
static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = {
|
static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = {
|
||||||
.mode_valid = intel_tv_mode_valid,
|
.mode_valid = intel_tv_mode_valid,
|
||||||
.get_modes = intel_tv_get_modes,
|
.get_modes = intel_tv_get_modes,
|
||||||
.best_encoder = intel_best_encoder,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct drm_encoder_funcs intel_tv_enc_funcs = {
|
static const struct drm_encoder_funcs intel_tv_enc_funcs = {
|
||||||
|
|
Loading…
Reference in a new issue