]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix VGA_DISP_DISABLE check
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 4 Oct 2013 17:32:25 +0000 (20:32 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 10 Oct 2013 10:46:57 +0000 (12:46 +0200)
commit7a7a98ac3f2ed9f00622412690105a3a549203cd
tree17267c8c11966a72b59f1af46b47c30992b93c4c
parentac1b09f1cbda9bee70c177c0fafd67f334fbd9c7
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>
drivers/gpu/drm/i915/intel_display.c