Commit 7373728d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Kill level 0 wm hack for VLV/CHV 



We now compute the watermarks correctly, so just return an error if we
can't support the configuration.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-15-ville.syrjala@linux.intel.com
parent 1a10ae6b

drivers/gpu/drm/i915/intel_pm.c

+0 −4
Original line number Diff line number Diff line
@@ -1186,10 +1186,6 @@ static bool vlv_plane_wm_compute(struct intel_crtc_state *crtc_state, 
		int wm = vlv_compute_wm_level(crtc_state, plane_state, level);

		int max_wm = plane_id == PLANE_CURSOR ? 63 : 511;



		/* FIXME just bail */

		if (WARN_ON(level == 0 && wm > max_wm))

			wm = max_wm;



		if (wm > max_wm)

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE