Op 12-12-16 om 21:35 schreef ville.syrjala@xxxxxxxxxxxxxxx: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > We now compute the watermarks correctly, so just return an error if we > can't support the configuration. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_pm.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 75a5bde43723..f3aed64e7086 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -1163,10 +1163,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; > Good riddance. Reviewed-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> Same for 3, 4, 5 and 6. 2 too if you remove intel_plane_wm_parameters, can do it in the same patch or separately. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
