On Wed, Jul 08, 2015 at 09:05:53AM -0700, Bob Paauwe wrote: > Clearing the watermarks for all pipes/planes when updating the > watermarks for a single CRTC change seems like the wrong thing to > do here. As is, this code will update any pipe/plane watermarks > that need updating and leave the remaining set to zero. Later, the > watermark checks in check_wm_state() will flag these zero'd out pipe/plane > watermarks and throw errors. > > By not clearing all pipe/plane watermark values, only those that > require changes are changed and the remaining stay unchanged. > > Signed-off-by: Bob Paauwe <bob.j.paauwe@xxxxxxxxx> Also, could you please prefix the subject of this patch by 'drm/i915/skl'? it will ensure people can easily find the SKL/BXT related patches to backport in their own tree. -- Damien > --- > drivers/gpu/drm/i915/intel_pm.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index c2f8956..25fc319 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3734,8 +3734,6 @@ static void skl_update_wm(struct drm_crtc *crtc) > struct skl_pipe_wm pipe_wm = {}; > struct intel_wm_config config = {}; > > - memset(results, 0, sizeof(*results)); > - > skl_compute_wm_global_parameters(dev, &config); > > if (!skl_update_pipe_wm(crtc, ¶ms, &config, > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx