From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed, 9 Oct 2013 16:17:57 +0000 (+0300)
Subject: drm/i915: Move LP1+ watermark merging out from hsw_compute_wm_results()
X-Git-Tag: v3.13-rc1~76^2~68^2~57
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0362c7816c8ad5d838ecd93f5526c1c725a1a8fd;p=pandora-kernel.git

drm/i915: Move LP1+ watermark merging out from hsw_compute_wm_results()

I want to convert hsw_find_best_result() to use intel_pipe_wm, so we
need to move the merging to happen outside hsw_compute_wm_results().

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

Reading git-diff-tree failed