From 06d813d0893df5e8e605fc1b52a47f1381568043 Mon Sep 17 00:00:00 2001
From: Vikas Sajjan <vikas.sajjan@linaro.org>
Date: Thu, 7 Mar 2013 12:15:21 +0530
Subject: [PATCH] --- yaml --- r: 371497 b: refs/heads/master c:
 7f4596f4aebcc9fcf2d50d3fe398508d710c4dd0 h: refs/heads/master i:   371495:
 0aba9ab360a762b572635109b5073d38d5e5b9c2 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/gpu/drm/exynos/exynos_drm_fimd.c  | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 81d0f2ced408..8fa0992461b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ddcc7364a93d18b80967b3a9b3f6aea107323f6
+refs/heads/master: 7f4596f4aebcc9fcf2d50d3fe398508d710c4dd0
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 98cc14725ba9..ebb77e46fb19 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -20,6 +20,7 @@
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 
+#include <video/of_display_timing.h>
 #include <video/samsung_fimd.h>
 #include <drm/exynos_drm.h>
 
@@ -884,10 +885,25 @@ static int fimd_probe(struct platform_device *pdev)
 
 	DRM_DEBUG_KMS("%s\n", __FILE__);
 
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		dev_err(dev, "no platform data specified\n");
-		return -EINVAL;
+	if (pdev->dev.of_node) {
+		pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+		if (!pdata) {
+			DRM_ERROR("memory allocation for pdata failed\n");
+			return -ENOMEM;
+		}
+
+		ret = of_get_fb_videomode(dev->of_node, &pdata->panel.timing,
+					OF_USE_NATIVE_MODE);
+		if (ret) {
+			DRM_ERROR("failed: of_get_fb_videomode() : %d\n", ret);
+			return ret;
+		}
+	} else {
+		pdata = pdev->dev.platform_data;
+		if (!pdata) {
+			DRM_ERROR("no platform data specified\n");
+			return -EINVAL;
+		}
 	}
 
 	panel = &pdata->panel;