lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 063/208] drm/i915: Use the correct GMCH_CTRL register for Sandybridge+
    Date
    3.11.10.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Wilson <chris@chris-wilson.co.uk>

    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>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/i915/intel_display.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
    index ee0b38f..cfe124a 100644
    --- a/drivers/gpu/drm/i915/intel_display.c
    +++ b/drivers/gpu/drm/i915/intel_display.c
    @@ -10072,14 +10072,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;
    }

    --
    1.8.3.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-01-13 18:41    [W:4.263 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site