From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Thu, 5 Dec 2013 13:51:34 +0000 (+0200)
Subject: drm/i915: Don't merge LP1+ watermarks on ILK/SNB/IVB when multiple pipes are enabled
X-Git-Tag: v3.14-rc1~47^2~16^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba22e26fe47b2a216e5438292aeeb8e015e9d64;p=pandora-kernel.git

drm/i915: Don't merge LP1+ watermarks on ILK/SNB/IVB when multiple pipes are enabled

Multi-pipe LP1+ watermarks are a HSW+ feature, so let's not do it on
earlier generations.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed