From: Chris Wilson Date: Wed, 22 Sep 2010 09:54:48 +0000 (+0100) Subject: drm/i915: Don't offset the pin used for crt_ddc X-Git-Tag: v2.6.37-rc1~92^2~28^2~55 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2896b5397570f6857fd5d0e0533f640b05b1d162;p=~shefty%2Frdma-dev.git drm/i915: Don't offset the pin used for crt_ddc Previously when converting the GMBUS pin to the GPIO reg, we would offset the pin by one and then use the look-up table. Now that we first try to use the GMBUS pin, we no longer need the offset and can use the value from the VBIOS directly. Reported-by: Carlos R. Mafra Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index d11bbcad4fe..123e31d5a80 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -299,7 +299,7 @@ parse_general_definitions(struct drm_i915_private *dev_priv, int bus_pin = general->crt_ddc_gmbus_pin; DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin); if (bus_pin >= 1 && bus_pin <= 6) - dev_priv->crt_ddc_pin = bus_pin - 1; + dev_priv->crt_ddc_pin = bus_pin; } else { DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n", block_size);