|
@@ -11126,14 +11126,15 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
|
|
|
int intel_modeset_vga_set_state(struct drm_device *dev, bool state)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
+ unsigned reg = INTEL_INFO(dev)->gen >= 6 ? SNB_GMCH_CTRL : INTEL_GMCH_CTRL;
|
|
|
u16 gmch_ctrl;
|
|
|
|
|
|
- pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl);
|
|
|
+ pci_read_config_word(dev_priv->bridge_dev, reg, &gmch_ctrl);
|
|
|
if (state)
|
|
|
gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE;
|
|
|
else
|
|
|
gmch_ctrl |= INTEL_GMCH_VGA_DISABLE;
|
|
|
- pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
|
|
|
+ pci_write_config_word(dev_priv->bridge_dev, reg, gmch_ctrl);
|
|
|
return 0;
|
|
|
}
|
|
|
|