diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 23:34:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 23:34:44 +0100 |
| commit | f573c66061184ce28196a22229b6214256ceacd8 (patch) | |
| tree | 91f47116c4b64145cf4031ec84f4f2418cb23087 /drivers/gpu | |
| parent | a8ed0b16a924a59b56906e83d6c033a04a9818f6 (diff) | |
drm/i915/dvo: Fix panel and DDC i2c pins
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 561fbc34cec..ea373283c93 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -81,7 +81,6 @@ struct intel_dvo { struct intel_encoder base; struct intel_dvo_device dev; - int ddc_bus; struct drm_display_mode *panel_fixed_mode; bool panel_wants_dither; @@ -245,7 +244,7 @@ static int intel_dvo_get_modes(struct drm_connector *connector) * that's not the case. */ intel_ddc_get_modes(connector, - &dev_priv->gmbus[intel_dvo->ddc_bus].adapter); + &dev_priv->gmbus[GMBUS_PORT_DPC].adapter); if (!list_empty(&connector->probed_modes)) return 1; @@ -349,7 +348,6 @@ void intel_dvo_init(struct drm_device *dev) struct intel_encoder *intel_encoder; struct intel_dvo *intel_dvo; struct intel_connector *intel_connector; - int ret = 0; int i; int encoder_type = DRM_MODE_ENCODER_NONE; @@ -367,9 +365,6 @@ void intel_dvo_init(struct drm_device *dev) drm_encoder_init(dev, &intel_encoder->base, &intel_dvo_enc_funcs, encoder_type); - /* Set up the DDC bus */ - intel_dvo->ddc_bus = GMBUS_PORT_DPB; - /* Now, try to find a controller */ for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) { struct drm_connector *connector = &intel_connector->base; @@ -384,7 +379,7 @@ void intel_dvo_init(struct drm_device *dev) if (dvo->gpio != 0) gpio = dvo->gpio; else if (dvo->type == INTEL_DVO_CHIP_LVDS) - gpio = GMBUS_PORT_PANEL; + gpio = GMBUS_PORT_SSC; else gpio = GMBUS_PORT_DPB; @@ -395,8 +390,7 @@ void intel_dvo_init(struct drm_device *dev) i2c = &dev_priv->gmbus[gpio].adapter; intel_dvo->dev = *dvo; - ret = dvo->dev_ops->init(&intel_dvo->dev, i2c); - if (!ret) + if (!dvo->dev_ops->init(&intel_dvo->dev, i2c)) continue; intel_encoder->type = INTEL_OUTPUT_DVO; |