drm/i915: change intel_ddc_get_modes() function parameters

This one replaces original param for intel_ddc_get_modes() with
DRM connector and i2c bus adapter instead. With explicit params,
we won't require that a single driver structure must hold connector
and DDC bus reference, which ease the conversion to splitted encoder/
connector model.

It also clears up for some cases that we would steal other DDC bus
for mode probe, like VGA analog DDC probe for DVI-I. Also it fixed
a bug in old DVI-I probe handling, that failed to restore origin
analog GPIO port.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 527cfa2626bf..a3b82081e1a7 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -639,7 +639,7 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
         int ret = 0;
 
         if (dev_priv->lvds_edid_good) {
-                ret = intel_ddc_get_modes(intel_encoder);
+                ret = intel_ddc_get_modes(connector, intel_encoder->ddc_bus);
 
                 if (ret)
                         return ret;
@@ -1066,7 +1066,7 @@ void intel_lvds_init(struct drm_device *dev)
          */
         dev_priv->lvds_edid_good = true;
 
-        if (!intel_ddc_get_modes(intel_encoder))
+        if (!intel_ddc_get_modes(connector, intel_encoder->ddc_bus))
                 dev_priv->lvds_edid_good = false;
 
         list_for_each_entry(scan, &connector->probed_modes, head) {