From 350138bae19f76939e94578a9f5462ef7d528dc4 Mon Sep 17 00:00:00 2001
From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Mon, 23 Apr 2012 19:35:47 +0900
Subject: [PATCH] --- yaml --- r: 307487 b: refs/heads/master c:
 7ecd34e82ce8d9da0cd99541eac4eaf9dd7eb27e h: refs/heads/master i:   307485:
 267f8213a659b3b40304bf7c9c42682876d289b3   307483:
 25e6a8c22a435c0cb4b2125388bc6c69f3faefb8   307479:
 cb36a3f0239b8eb10f8a3c55e2a3cc2229344ddd   307471:
 e5c1e833ed4f3ecbddaaf430b97bb629c51b19ed   307455:
 a04b7ef5d79a7caee997218753b197a217654c50 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/gpu/drm/exynos/exynos_hdmi.c | 13 ++++++-------
 trunk/include/drm/exynos_drm.h             | 12 +++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 5422d295f5e8..102947a148c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40cd7e0c02f37af4b44fc00531873832e45587e9
+refs/heads/master: 7ecd34e82ce8d9da0cd99541eac4eaf9dd7eb27e
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
index b00353876458..7365cc6ddec7 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -57,12 +57,9 @@ struct hdmi_resources {
 struct hdmi_context {
 	struct device			*dev;
 	struct drm_device		*drm_dev;
-	struct fb_videomode		*default_timing;
-	unsigned int			is_v13:1;
-	unsigned int			default_win;
-	unsigned int			default_bpp;
 	bool				hpd_handle;
 	bool				enabled;
+	bool				is_v13;
 
 	struct resource			*regs_res;
 	void __iomem			*regs;
@@ -78,6 +75,9 @@ struct hdmi_context {
 
 	struct hdmi_resources		res;
 	void				*parent_ctx;
+
+	void				(*cfg_hpd)(bool external);
+	int				(*get_hpd)(void);
 };
 
 /* HDMI Version 1.3 */
@@ -2243,9 +2243,8 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, drm_hdmi_ctx);
 
 	hdata->is_v13 = pdata->is_v13;
-	hdata->default_win = pdata->default_win;
-	hdata->default_timing = &pdata->timing;
-	hdata->default_bpp = pdata->bpp;
+	hdata->cfg_hpd = pdata->cfg_hpd;
+	hdata->get_hpd = pdata->get_hpd;
 	hdata->dev = dev;
 
 	ret = hdmi_resources_init(hdata);
diff --git a/trunk/include/drm/exynos_drm.h b/trunk/include/drm/exynos_drm.h
index 70c0f7e7db82..44f79cf468d4 100644
--- a/trunk/include/drm/exynos_drm.h
+++ b/trunk/include/drm/exynos_drm.h
@@ -197,16 +197,14 @@ struct exynos_drm_common_hdmi_pd {
 /**
  * Platform Specific Structure for DRM based HDMI core.
  *
- * @timing: default video mode for initializing
- * @default_win: default window layer number to be used for UI.
- * @bpp: default bit per pixel.
  * @is_v13: set if hdmi version 13 is.
+ * @cfg_hpd: function pointer to configure hdmi hotplug detection pin
+ * @get_hpd: function pointer to get value of hdmi hotplug detection pin
  */
 struct exynos_drm_hdmi_pdata {
-	struct fb_videomode		timing;
-	unsigned int			default_win;
-	unsigned int			bpp;
-	unsigned int			is_v13:1;
+	bool is_v13;
+	void (*cfg_hpd)(bool external);
+	int (*get_hpd)(void);
 };
 
 #endif	/* __KERNEL__ */