drm/i915: Add some more tracked state to intel_pipe_wm
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 7 Mar 2014 16:32:09 +0000 (18:32 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Apr 2014 12:42:03 +0000 (14:42 +0200)
commit2a44b76bb5a1f520371432825c91fa46c63bde84
tree75fa476cca0faf03cd4264c4ff77fc3b2bcd5639
parent17d36749a559905f7d9a640239a9fc74fc3bb445
drm/i915: Add some more tracked state to intel_pipe_wm

intel_pipe_wm will be used to track the state in different stages
of the watermark update process. For that we need to keep a bit
more state in intel_pipe_wm.

We also need to separate the multi-pipe intel_wm_config computation
from ilk_compute_wm_parameters() as that one deals with the future
state, and we need the intel_wm_config to match the current hardware
state at the time we do the watermark merging for multiple pipes.

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