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

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

drm/i915: Linetime watermarks are a HSW feature 



Linetime watermarks don't exist on ILK/SNB/IVB, so don't compute them
except on HSW.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6c8b6c28

drivers/gpu/drm/i915/intel_pm.c

+4 −2
Original line number Diff line number Diff line
@@ -2655,6 +2655,7 @@ static bool intel_compute_pipe_wm(struct drm_crtc *crtc, 
		ilk_compute_wm_level(dev_priv, level, params,

				     &pipe_wm->wm[level]);



	if (IS_HASWELL(dev))

		pipe_wm->linetime = hsw_compute_linetime_wm(dev, crtc);



	/* At least LP0 must be valid */
@@ -3234,6 +3235,7 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc) 
	};



	hw->wm_pipe[pipe] = I915_READ(wm0_pipe_reg[pipe]);

	if (IS_HASWELL(dev))

		hw->wm_linetime[pipe] = I915_READ(PIPE_WM_LINETIME(pipe));



	if (intel_crtc_active(crtc)) {