drm/i915: Move LP1+ watermark merging out from hsw_compute_wm_results()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Oct 2013 16:17:57 +0000 (19:17 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 15 Oct 2013 07:57:23 +0000 (09:57 +0200)
commit0362c7816c8ad5d838ecd93f5526c1c725a1a8fd
tree0dc13cf5e42bacd55be108a230093d272a11ba3a
parent7c4a395ff8f441acb7876281c6777624e6410349
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>
drivers/gpu/drm/i915/intel_pm.c