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

Commit 4271b753 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Stop calling encoder->mode_set 



All the callbacks are gone now.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 07e4fb9e

drivers/gpu/drm/i915/intel_display.c

+2 −36
Original line number Diff line number Diff line
@@ -7469,40 +7469,6 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, 
	return true;

}



static int intel_crtc_mode_set(struct drm_crtc *crtc,

			       int x, int y,

			       struct drm_framebuffer *fb)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_encoder *encoder;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_display_mode *mode = &intel_crtc->config.requested_mode;

	int pipe = intel_crtc->pipe;

	int ret;



	drm_vblank_pre_modeset(dev, pipe);



	ret = dev_priv->display.crtc_mode_set(crtc, x, y, fb);



	drm_vblank_post_modeset(dev, pipe);



	if (ret != 0)

		return ret;



	for_each_encoder_on_crtc(dev, crtc, encoder) {

		DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n",

			encoder->base.base.id,

			drm_get_encoder_name(&encoder->base),

			mode->base.id, mode->name);



		if (encoder->mode_set)

			encoder->mode_set(encoder);

	}



	return 0;

}



static struct {

	int clock;

	u32 config;
@@ -10260,7 +10226,7 @@ static int __intel_set_mode(struct drm_crtc *crtc, 
	 * on the DPLL.

	 */

	for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {

		ret = intel_crtc_mode_set(&intel_crtc->base,

		ret = dev_priv->display.crtc_mode_set(&intel_crtc->base,

						      x, y, fb);

		if (ret)

			goto done;