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

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
...@@ -1186,10 +1186,6 @@ static bool vlv_plane_wm_compute(struct intel_crtc_state *crtc_state, ...@@ -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 wm = vlv_compute_wm_level(crtc_state, plane_state, level);
int max_wm = plane_id == PLANE_CURSOR ? 63 : 511; 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) if (wm > max_wm)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment