Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into...

[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_modes.c

diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index 8e5c83b..4b1fd3d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -54,9 +54,9 @@ bool intel_ddc_probe(struct intel_encoder *intel_encoder)
                }
        };
 
-       intel_i2c_quirk_set(intel_encoder->base.dev, true);
+       intel_i2c_quirk_set(intel_encoder->enc.dev, true);
        ret = i2c_transfer(intel_encoder->ddc_bus, msgs, 2);
-       intel_i2c_quirk_set(intel_encoder->base.dev, false);
+       intel_i2c_quirk_set(intel_encoder->enc.dev, false);
        if (ret == 2)
                return true;
 
@@ -66,22 +66,23 @@ bool intel_ddc_probe(struct intel_encoder *intel_encoder)
 /**
  * intel_ddc_get_modes - get modelist from monitor
  * @connector: DRM connector device to use
+ * @adapter: i2c adapter
  *
  * Fetch the EDID information from @connector using the DDC bus.
  */
-int intel_ddc_get_modes(struct intel_encoder *intel_encoder)
+int intel_ddc_get_modes(struct drm_connector *connector,
+                       struct i2c_adapter *adapter)
 {
        struct edid *edid;
        int ret = 0;
 
-       intel_i2c_quirk_set(intel_encoder->base.dev, true);
-       edid = drm_get_edid(&intel_encoder->base, intel_encoder->ddc_bus);
-       intel_i2c_quirk_set(intel_encoder->base.dev, false);
+       intel_i2c_quirk_set(connector->dev, true);
+       edid = drm_get_edid(connector, adapter);
+       intel_i2c_quirk_set(connector->dev, false);
        if (edid) {
-               drm_mode_connector_update_edid_property(&intel_encoder->base,
-                                                       edid);
-               ret = drm_add_edid_modes(&intel_encoder->base, edid);
-               intel_encoder->base.display_info.raw_edid = NULL;
+               drm_mode_connector_update_edid_property(connector, edid);
+               ret = drm_add_edid_modes(connector, edid);
+               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }