From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 7 Mar 2014 16:32:09 +0000 (+0200)
Subject: drm/i915: Add some more tracked state to intel_pipe_wm
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~63^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a44b76bb5a1f520371432825c91fa46c63bde84;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed