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

Commit 3c65d1d1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Disable SDVO port after the pipe on PCH platforms 



While at it also remove the redundant/unneeded w/a like done for hdmi
already.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Mention that this also removes the unneeded w/a, as suggested
by Jesse.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a4790cec

drivers/gpu/drm/i915/intel_sdvo.c

+17 −8
Original line number Diff line number Diff line
@@ -1465,6 +1465,15 @@ static void intel_disable_sdvo(struct intel_encoder *encoder) 
	}

}



static void pch_disable_sdvo(struct intel_encoder *encoder)

{

}



static void pch_post_disable_sdvo(struct intel_encoder *encoder)

{

	intel_disable_sdvo(encoder);

}



static void intel_enable_sdvo(struct intel_encoder *encoder)

{

	struct drm_device *dev = encoder->base.dev;
@@ -1477,14 +1486,9 @@ static void intel_enable_sdvo(struct intel_encoder *encoder) 
	bool success;



	temp = I915_READ(intel_sdvo->sdvo_reg);

	if ((temp & SDVO_ENABLE) == 0) {

		/* HW workaround for IBX, we need to move the port

		 * to transcoder A before disabling it, so restore it here. */

		if (HAS_PCH_IBX(dev))

			temp |= SDVO_PIPE_SEL(intel_crtc->pipe);

	temp |= SDVO_ENABLE;

	intel_sdvo_write_sdvox(intel_sdvo, temp);



		intel_sdvo_write_sdvox(intel_sdvo, temp | SDVO_ENABLE);

	}

	for (i = 0; i < 2; i++)

		intel_wait_for_vblank(dev, intel_crtc->pipe);
@@ -2987,7 +2991,12 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
	}



	intel_encoder->compute_config = intel_sdvo_compute_config;

	if (HAS_PCH_SPLIT(dev)) {

		intel_encoder->disable = pch_disable_sdvo;

		intel_encoder->post_disable = pch_post_disable_sdvo;

	} else {

		intel_encoder->disable = intel_disable_sdvo;

	}

	intel_encoder->pre_enable = intel_sdvo_pre_enable;

	intel_encoder->enable = intel_enable_sdvo;

	intel_encoder->get_hw_state = intel_sdvo_get_hw_state;