drm/i915: Use the correct GMCH_CTRL register for Sandybridge+
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 17 Dec 2013 14:34:50 +0000 (14:34 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 15 Feb 2014 19:20:14 +0000 (19:20 +0000)
commitcee7e2f6b271c36ee0bf3cc3836cbde77301d10e
tree2bc0f0baac5f7f0b98bb67cd4c47b5dfb4074846
parent2fd7b46281e382ea7e35ac120efa73d9fa912ee7
drm/i915: Use the correct GMCH_CTRL register for Sandybridge+

commit a885b3ccc74d8e38074e1c43a47c354c5ea0b01e upstream.

The GMCH_CTRL register (or MGCC in the spec) is at a different address
on Sandybridge, and the address to which we currently write to is
undefined. These stray writes appear to upset (hard hang) my Ivybridge
machine whilst it is in UEFI mode.

Note that the register is still marked as locked RO on Sandybridge, so
vgaarb is still dysfunctional.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[bwh: Backported to 3.2: add definition of SNB_GMCH_CTRL in i915_reg.h]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c