Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61b77ddd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: clean up encoder_prepare/commit 



We no longer need them. And now that all encoders are converted, we
can finally move the cpt modeset check to the right place - at the end
of the crtc_enable function.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fa5c73b1

drivers/gpu/drm/i915/intel_display.c

+3 −20
Original line number Original line Diff line number Diff line
@@ -3269,6 +3269,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 
encoders:

encoders:

	for_each_encoder_on_crtc(dev, crtc, encoder)

	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->enable(encoder);

		encoder->enable(encoder);



	if (HAS_PCH_CPT(dev))

		intel_cpt_verify_modeset(dev, intel_crtc->pipe);

}

}





static void ironlake_crtc_disable(struct drm_crtc *crtc)

static void ironlake_crtc_disable(struct drm_crtc *crtc)
@@ -3524,26 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) 
	}

	}

}

}





void intel_encoder_prepare(struct drm_encoder *encoder)

{

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;

	/* lvds has its own version of prepare see intel_lvds_prepare */

	encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);

}



void intel_encoder_commit(struct drm_encoder *encoder)

{

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;

	struct drm_device *dev = encoder->dev;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);



	/* lvds has its own version of commit see intel_lvds_commit */

	encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);



	if (HAS_PCH_CPT(dev))

		intel_cpt_verify_modeset(dev, intel_crtc->pipe);

}



void intel_encoder_noop(struct drm_encoder *encoder)

void intel_encoder_noop(struct drm_encoder *encoder)

{

{

}

}

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -412,8 +412,6 @@ extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); 




extern void intel_crtc_load_lut(struct drm_crtc *crtc);

extern void intel_crtc_load_lut(struct drm_crtc *crtc);

extern void intel_crtc_update_dpms(struct drm_crtc *crtc);

extern void intel_crtc_update_dpms(struct drm_crtc *crtc);

extern void intel_encoder_prepare(struct drm_encoder *encoder);

extern void intel_encoder_commit(struct drm_encoder *encoder);

extern void intel_encoder_noop(struct drm_encoder *encoder);

extern void intel_encoder_noop(struct drm_encoder *encoder);

extern void intel_encoder_disable(struct drm_encoder *encoder);

extern void intel_encoder_disable(struct drm_encoder *encoder);

extern void intel_encoder_destroy(struct drm_encoder *encoder);

extern void intel_encoder_destroy(struct drm_encoder *encoder);