From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 7 Mar 2014 16:32:10 +0000 (+0200)
Subject: drm/i915: Skip watermark merging for inactive pipes
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~63^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe392efdae2982243e3a560b8f41c8e4c89b5d51;p=pandora-kernel.git

drm/i915: Skip watermark merging for inactive pipes

Even though the inactive pipes should have their watermarks set to all 0
with enable=true, we can possibly shave off a few cycles by completely
skipping the merge procedure for inactive pipes.

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