drm/i915: Call intel_update_watermarks() in specific place during modeset
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 10 Sep 2013 08:39:55 +0000 (11:39 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 10 Sep 2013 09:15:47 +0000 (11:15 +0200)
commitf37fcc2a263b3a6d9fb9730e0d828a3f9d15a8b0
tree189345dabf9b53726ae8cfa3766bea40d5236135
parent46ba614c0045b0b5354397010578e8b56d621251
drm/i915: Call intel_update_watermarks() in specific place during modeset

Make the call to intel_update_watermarks() just once or twice during
modeset. Ideally it should happen independently when each plane gets
enabled/disabled, but for now it seems better to keep it in central
place. We can improve things when we get all the planes sorted out
in a better way.

When enabling set up the watermarks just before the pipe is enabled.
And when disabling we need to wait until we've marked the crtc as
inactive, as otherwise intel_crtc_active() would still think the pipe
is enabled and the computed watermarks would reflect that.

v2: Pimp up the commit message a bit

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c