From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 4 Oct 2013 17:32:25 +0000 (+0300)
Subject: drm/i915: Fix VGA_DISP_DISABLE check
X-Git-Tag: v3.13-rc1~76^2~68^2~114
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1553faa904f3f8bdd734ee1404ce39c652bc9c6;p=pandora-kernel.git

drm/i915: Fix VGA_DISP_DISABLE check

The VGACNTRL register contains a bunch of other stuff besides
the VGA_DISP_DISABLE bit. When we write the register we always set those
other bits to zero, so normally the current check would work.

However on HSW disabling and re-enabling the power well will reset the
VGACNTRL register to its default value, which has several of the other
bits set as well.

So only look at the VGA_DISP_DISABLE bit when checking whether the VGA
plane needs re-disabling.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed