Reviewed-by: Ander Conselvan de Oliveira <conselvan2@xxxxxxxxx>
On Mon, 2015-07-27 at 14:35 +0200, Maarten Lankhorst wrote:
> There are no more users, byebye!
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 37 +-----------------------------------
> drivers/gpu/drm/i915/intel_drv.h | 1 -
> 2 files changed, 1 insertion(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 341fadb40c81..23175ce6583d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12196,27 +12196,12 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc)
> static void
> intel_modeset_update_state(struct drm_atomic_state *state)
> {
> - struct drm_device *dev = state->dev;
> - struct intel_encoder *intel_encoder;
> struct drm_crtc *crtc;
> struct drm_crtc_state *crtc_state;
> - struct drm_connector *connector;
> int i;
>
> intel_shared_dpll_commit(state);
>
> - for_each_intel_encoder(dev, intel_encoder) {
> - if (!intel_encoder->base.crtc)
> - continue;
> -
> - crtc = intel_encoder->base.crtc;
> - crtc_state = drm_atomic_get_existing_crtc_state(state, crtc);
> - if (!crtc_state || !needs_modeset(crtc->state))
> - continue;
> -
> - intel_encoder->connectors_active = false;
> - }
> -
> drm_atomic_helper_update_legacy_modeset_state(state->dev, state);
>
> /* Double check state. */
> @@ -12231,21 +12216,6 @@ intel_modeset_update_state(struct drm_atomic_state *state)
> else
> crtc->hwmode.crtc_clock = 0;
> }
> -
> - list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> - if (!connector->encoder || !connector->encoder->crtc)
> - continue;
> -
> - crtc = connector->encoder->crtc;
> - crtc_state = drm_atomic_get_existing_crtc_state(state, crtc);
> - if (!crtc_state || !needs_modeset(crtc->state))
> - continue;
> -
> - if (crtc->state->active) {
> - intel_encoder = to_intel_encoder(connector->encoder);
> - intel_encoder->connectors_active = true;
> - }
> - }
> }
>
> static bool intel_fuzzy_clock_check(int clock1, int clock2)
> @@ -14965,10 +14935,8 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
> * actually up, hence no need to break them. */
> WARN_ON(crtc->active);
>
> - for_each_encoder_on_crtc(dev, &crtc->base, encoder) {
> - WARN_ON(encoder->connectors_active);
> + for_each_encoder_on_crtc(dev, &crtc->base, encoder)
> encoder->base.crtc = NULL;
> - }
> }
>
> if (crtc->active || HAS_GMCH_DISPLAY(dev)) {
> @@ -15027,7 +14995,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> encoder->post_disable(encoder);
> }
> encoder->base.crtc = NULL;
> - encoder->connectors_active = false;
>
> /* Inconsistent output/port/pipe state happens presumably due to
> * a bug in one of the get_hw_state functions. Or someplace else
> @@ -15189,7 +15156,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> encoder->base.crtc = NULL;
> }
>
> - encoder->connectors_active = false;
> DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n",
> encoder->base.base.id,
> encoder->base.name,
> @@ -15200,7 +15166,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> for_each_intel_connector(dev, connector) {
> if (connector->get_hw_state(connector)) {
> connector->base.dpms = DRM_MODE_DPMS_ON;
> - connector->encoder->connectors_active = true;
> connector->base.encoder = &connector->encoder->base;
> } else {
> connector->base.dpms = DRM_MODE_DPMS_OFF;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 62073d2f83fa..c30bbb22381b 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -133,7 +133,6 @@ struct intel_encoder {
>
> enum intel_output_type type;
> unsigned int cloneable;
> - bool connectors_active;
> void (*hot_plug)(struct intel_encoder *);
> bool (*compute_config)(struct intel_encoder *,
> struct intel_crtc_state *);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
