We already update watermarks at all the right places in the crtc_enable/disable callbacks. And since ->mode_set doesn't change the active state, nothing will have changed ... v2: Rebase on top of latest haswell copy&pasta. Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> --- drivers/gpu/drm/i915/intel_display.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9e13636..bb42102 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4713,8 +4713,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - return ret; } @@ -5384,8 +5382,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - intel_update_linetime_watermarks(dev, pipe, adjusted_mode); return fdi_config_ok ? ret : -EINVAL; @@ -5471,8 +5467,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - intel_update_linetime_watermarks(dev, pipe, adjusted_mode); return ret; -- 1.7.11.7
