From: Ville Syrjälä Date: Thu, 24 Jan 2013 13:29:55 +0000 (+0200) Subject: drm/i915: GPIO/GMBUS registers need an offset on VLV X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d811215004dbcc213e70eef94541aa10a2258aef;p=linux-beck.git drm/i915: GPIO/GMBUS registers need an offset on VLV GPIO/GMBUS registers must be offset on VLV, so simply adjust gpio_mmio_base to include the correct offset. Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 7f0904170963..acf8aec9ada7 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -515,6 +515,8 @@ int intel_setup_gmbus(struct drm_device *dev) if (HAS_PCH_SPLIT(dev)) dev_priv->gpio_mmio_base = PCH_GPIOA - GPIOA; + else if (IS_VALLEYVIEW(dev)) + dev_priv->gpio_mmio_base = VLV_DISPLAY_BASE; else dev_priv->gpio_mmio_base = 0;