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

Commit c9deac97 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: rip out encoder->prepare/commit 



With the new infrastructure we're doing this when enabling/disabling
the entire display pipe.

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

drivers/gpu/drm/i915/intel_crt.c

+0 −2
Original line number Diff line number Diff line
@@ -617,8 +617,6 @@ static void intel_crt_reset(struct drm_connector *connector) 


static const struct drm_encoder_helper_funcs crt_encoder_funcs = {

	.mode_fixup = intel_crt_mode_fixup,

	.prepare = intel_encoder_noop,

	.commit = intel_encoder_noop,

	.mode_set = intel_crt_mode_set,

	.disable = intel_encoder_disable,

};

drivers/gpu/drm/i915/intel_display.c

+0 −24
Original line number Diff line number Diff line
@@ -3527,10 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) 
	}

}



void intel_encoder_noop(struct drm_encoder *encoder)

{

}



void intel_encoder_disable(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@@ -6701,16 +6697,6 @@ bool intel_set_mode(struct drm_crtc *crtc, 
	}

	DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);



	/* Prepare the encoders and CRTCs before setting the mode. */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {



		if (encoder->crtc != crtc)

			continue;

		encoder_funcs = encoder->helper_private;

		/* Disable the encoders as the first thing we do. */

		encoder_funcs->prepare(encoder);

	}



	intel_crtc_prepare_encoders(dev);



	crtc_funcs->prepare(crtc);
@@ -6737,16 +6723,6 @@ bool intel_set_mode(struct drm_crtc *crtc, 
	/* Now enable the clocks, plane, pipe, and connectors that we set up. */

	crtc_funcs->commit(crtc);



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {



		if (encoder->crtc != crtc)

			continue;



		encoder_funcs = encoder->helper_private;

		encoder_funcs->commit(encoder);



	}



	/* Store real post-adjustment hardware mode. */

	crtc->hwmode = *adjusted_mode;

drivers/gpu/drm/i915/intel_dp.c

+0 −2
Original line number Diff line number Diff line
@@ -2348,9 +2348,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) 


static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {

	.mode_fixup = intel_dp_mode_fixup,

	.prepare = intel_encoder_noop,

	.mode_set = intel_dp_mode_set,

	.commit = intel_encoder_noop,

	.disable = intel_encoder_disable,

};

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -414,7 +414,6 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, 
			   int x, int y, struct drm_framebuffer *old_fb);

extern void intel_crtc_load_lut(struct drm_crtc *crtc);

extern void intel_crtc_update_dpms(struct drm_crtc *crtc);

extern void intel_encoder_noop(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_dpms(struct intel_encoder *encoder, int mode);

drivers/gpu/drm/i915/intel_dvo.c

+0 −2
Original line number Diff line number Diff line
@@ -318,9 +318,7 @@ static void intel_dvo_destroy(struct drm_connector *connector) 


static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {

	.mode_fixup = intel_dvo_mode_fixup,

	.prepare = intel_encoder_noop,

	.mode_set = intel_dvo_mode_set,

	.commit = intel_encoder_noop,

	.disable = intel_encoder_disable,

};