52 files changed, 2267 insertions, 1426 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5dda07cf7097..fadcd44ff196 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -395,13 +395,14 @@ out:
  * \param adapter : i2c device adaptor
  * \return 1 on success
  */
-static bool
+bool
 drm_probe_ddc(struct i2c_adapter *adapter)
 {
         unsigned char out;
 
         return (drm_do_probe_ddc_edid(adapter, &out, 0, 1) == 0);
 }
+EXPORT_SYMBOL(drm_probe_ddc);
 
 /**
  * drm_get_edid - get EDID data, if available
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
index 961a1806a246..37e6ec704e1d 100644
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/drivers/gpu/drm/exynos/exynos_ddc.c
@@ -26,29 +26,41 @@ static int s5p_ddc_probe(struct i2c_client *client,
 {
         hdmi_attach_ddc_client(client);
 
-        dev_info(&client->adapter->dev, "attached s5p_ddc "
-                "into i2c adapter successfully\n");
+        dev_info(&client->adapter->dev,
+                "attached %s into i2c adapter successfully\n",
+                client->name);
 
         return 0;
 }
 
 static int s5p_ddc_remove(struct i2c_client *client)
 {
-        dev_info(&client->adapter->dev, "detached s5p_ddc "
-                "from i2c adapter successfully\n");
+        dev_info(&client->adapter->dev,
+                "detached %s from i2c adapter successfully\n",
+                client->name);
 
         return 0;
 }
 
 static struct i2c_device_id ddc_idtable[] = {
         {"s5p_ddc", 0},
+        {"exynos5-hdmiddc", 0},
         { },
 };
 
+static struct of_device_id hdmiddc_match_types[] = {
+        {
+                .compatible = "samsung,exynos5-hdmiddc",
+        }, {
+                /* end node */
+        }
+};
+
 struct i2c_driver ddc_driver = {
         .driver = {
-                .name = "s5p_ddc",
+                .name = "exynos-hdmiddc",
                 .owner = THIS_MODULE,
+                .of_match_table = hdmiddc_match_types,
         },
         .id_table       = ddc_idtable,
         .probe          = s5p_ddc_probe,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index c2b1b1441ed0..18c271862ca8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c
@@ -40,6 +40,7 @@ struct exynos_drm_connector {
         struct drm_connector    drm_connector;
         uint32_t                encoder_id;
         struct exynos_drm_manager *manager;
+        uint32_t                dpms;
 };
 
 /* convert exynos_video_timings to drm_display_mode */
@@ -149,8 +150,12 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
                 count = drm_add_edid_modes(connector, edid);
                 kfree(edid);
         } else {
-                struct drm_display_mode *mode = drm_mode_create(connector->dev);
                 struct exynos_drm_panel_info *panel;
+                struct drm_display_mode *mode = drm_mode_create(connector->dev);
+                if (!mode) {
+                        DRM_ERROR("failed to create a new display mode.\n");
+                        return 0;
+                }
 
                 if (display_ops->get_panel)
                         panel = display_ops->get_panel(manager->dev);
@@ -194,8 +199,7 @@ static int ex