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

Commit 6714afb1 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/sdvo: Border and stall select became test bits in gen5



This is even more important as those bits will be moved in future.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 49b14a5c
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -1045,7 +1045,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,

	/* Set the SDVO control regs. */
	if (INTEL_INFO(dev)->gen >= 4) {
		sdvox = SDVO_BORDER_ENABLE;
		sdvox = 0;
		if (INTEL_INFO(dev)->gen < 5)
			sdvox |= SDVO_BORDER_ENABLE;
		if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
			sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
		if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
@@ -1075,7 +1077,8 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
		sdvox |= (pixel_multiplier - 1) << SDVO_PORT_MULTIPLY_SHIFT;
	}

	if (input_dtd.part2.sdvo_flags & SDVO_NEED_TO_STALL)
	if (input_dtd.part2.sdvo_flags & SDVO_NEED_TO_STALL &&
	    INTEL_INFO(dev)->gen < 5)
		sdvox |= SDVO_STALL_SELECT;
	intel_sdvo_write_sdvox(intel_sdvo, sdvox);
}