Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (50 commits)
  drm: include kernel list header file in hashtab header
  drm: Export hash table functionality.
  drm: Split out the mm declarations in a separate header. Add atomic operations.
  drm/radeon: add support for RV790.
  drm/radeon: add rv740 drm support.
  drm_calloc_large: check right size, check integer overflow, use GFP_ZERO
  drm: Eliminate magic I2C frobbing when reading EDID
  drm/i915: duplicate desired mode for use by fbcon.
  drm/via: vfree() no need checking before calling it
  drm: Replace DRM_DEBUG with DRM_DEBUG_DRIVER in i915 driver
  drm: Replace DRM_DEBUG with DRM_DEBUG_MODE in drm_mode
  drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in intel_sdvo
  drm/i915: replace DRM_DEBUG with DRM_DEBUG_KMS in intel_lvds
  drm: add separate drm debugging levels
  radeon: remove _DRM_DRIVER from the preadded sarea map
  drm: don't associate _DRM_DRIVER maps with a master
  drm: simplify kcalloc() call to kzalloc().
  intelfb: fix spelling of "CLOCK"
  drm: fix LOCK_TEST_WITH_RETURN macro
  drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
  ...

1 files changed, 1 insertions, 73 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 6f6b26479d82..801a0d0e0810 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -589,85 +589,13 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter,
 }
 EXPORT_SYMBOL(drm_do_probe_ddc_edid);
 
-/**
- * Get EDID information.
- *
- * \param adapter : i2c device adaptor.
- * \param buf     : EDID data buffer to be filled
- * \param len     : EDID data buffer length
- * \return 0 on success or -1 on failure.
- *
- * Initialize DDC, then fetch EDID information
- * by calling drm_do_probe_ddc_edid function.
- */
-static int drm_ddc_read(struct i2c_adapter *adapter,
-                        unsigned char *buf, int len)
-{
-        struct i2c_algo_bit_data *algo_data = adapter->algo_data;
-        int i, j;
-        int ret = -1;
-
-        algo_data->setscl(algo_data->data, 1);
-
-        for (i = 0; i < 1; i++) {
-                /* For some old monitors we need the
-                 * following process to initialize/stop DDC
-                 */
-                algo_data->setsda(algo_data->data, 1);
-                msleep(13);
-
-                algo_data->setscl(algo_data->data, 1);
-                for (j = 0; j < 5; j++) {
-                        msleep(10);
-                        if (algo_data->getscl(algo_data->data))
-                                break;
-                }
-                if (j == 5)
-                        continue;
-
-                algo_data->setsda(algo_data->data, 0);
-                msleep(15);
-                algo_data->setscl(algo_data->data, 0);
-                msleep(15);
-                algo_data->setsda(algo_data->data, 1);
-                msleep(15);
-
-                /* Do the real work */
-                ret = drm_do_probe_ddc_edid(adapter, buf, len);
-                algo_data->setsda(algo_data->data, 0);
-                algo_data->setscl(algo_data->data, 0);
-                msleep(15);
-
-                algo_data->setscl(algo_data->data, 1);
-                for (j = 0; j < 10; j++) {
-                        msleep(10);
-                        if (algo_data->getscl(algo_data->data))
-                                break;
-                }
-
-                algo_data->setsda(algo_data->data, 1);
-                msleep(15);
-                algo_data->setscl(algo_data->data, 0);
-                algo_data->setsda(algo_data->data, 0);
-                if (ret == 0)
-                        break;
-        }
-        /* Release the DDC lines when done or the Apple Cinema HD display
-         * will switch off
-         */
-        algo_data->setsda(algo_data->data, 1);
-        algo_data->setscl(algo_data->data, 1);
-
-        return ret;
-}
-
 static int drm_ddc_read_edid(struct drm_connector *connector,
                              struct i2c_adapter *adapter,
                              char *buf, int len)
 {
         int ret;
 
-        ret = drm_ddc_read(adapter, buf, len);
+        ret = drm_do_probe_ddc_edid(adapter, buf, len);
         if (ret != 0) {
                 dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",
                          drm_get_connector_name(connector));