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

Commit b5e508d4 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: implement workaround for VTOTAL when using TRANSCODER_EDP 



See the documentation for the DDI_FUNC_CTL register, EDP Input Select
bits: when the EDP input selection is B, the VTOTAL_B must be
programmed with the VTOTAL_EDP value, same thing for selection C.

V2: Use I915_READ as suggested by Daniel Vetter.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fe2b8f9d

drivers/gpu/drm/i915/intel_display.c

+8 −0
Original line number Diff line number Diff line
@@ -4524,6 +4524,14 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc, 
		   (adjusted_mode->crtc_vsync_start - 1) |

		   ((adjusted_mode->crtc_vsync_end - 1) << 16));



	/* Workaround: when the EDP input selection is B, the VTOTAL_B must be

	 * programmed with the VTOTAL_EDP value. Same for VTOTAL_C. This is

	 * documented on the DDI_FUNC_CTL register description, EDP Input Select

	 * bits. */

	if (IS_HASWELL(dev) && cpu_transcoder == TRANSCODER_EDP &&

	    (pipe == PIPE_B || pipe == PIPE_C))

		I915_WRITE(VTOTAL(pipe), I915_READ(VTOTAL(cpu_transcoder)));



	/* pipesrc controls the size that is scaled from, which should

	 * always be the user's requested size.

	 */