aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2012-04-23 06:35:47 -0400
committerInki Dae <inki.dae@samsung.com>2012-05-08 05:46:32 -0400
commit7ecd34e82ce8d9da0cd99541eac4eaf9dd7eb27e (patch)
tree54d383bab29aca1fc57edde0a5c621008c2aa242
parent40cd7e0c02f37af4b44fc00531873832e45587e9 (diff)
drm/exynos: cleanup for hdmi platform data
The exynos_drm_hdmi_pdata struct have owned unnessary members. Remove them and add a function pointer to configure hdmi hotplug detection pin. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c13
-rw-r--r--include/drm/exynos_drm.h12
2 files changed, 11 insertions, 14 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index b00353876458..7365cc6ddec7 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -57,12 +57,9 @@ struct hdmi_resources {
57struct hdmi_context { 57struct hdmi_context {
58 struct device *dev; 58 struct device *dev;
59 struct drm_device *drm_dev; 59 struct drm_device *drm_dev;
60 struct fb_videomode *default_timing;
61 unsigned int is_v13:1;
62 unsigned int default_win;
63 unsigned int default_bpp;
64 bool hpd_handle; 60 bool hpd_handle;
65 bool enabled; 61 bool enabled;
62 bool is_v13;
66 63
67 struct resource *regs_res; 64 struct resource *regs_res;
68 void __iomem *regs; 65 void __iomem *regs;
@@ -78,6 +75,9 @@ struct hdmi_context {
78 75
79 struct hdmi_resources res; 76 struct hdmi_resources res;
80 void *parent_ctx; 77 void *parent_ctx;
78
79 void (*cfg_hpd)(bool external);
80 int (*get_hpd)(void);
81}; 81};
82 82
83/* HDMI Version 1.3 */ 83/* HDMI Version 1.3 */
@@ -2243,9 +2243,8 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
2243 platform_set_drvdata(pdev, drm_hdmi_ctx); 2243 platform_set_drvdata(pdev, drm_hdmi_ctx);
2244 2244
2245 hdata->is_v13 = pdata->is_v13; 2245 hdata->is_v13 = pdata->is_v13;
2246 hdata->default_win = pdata->default_win; 2246 hdata->cfg_hpd = pdata->cfg_hpd;
2247 hdata->default_timing = &pdata->timing; 2247 hdata->get_hpd = pdata->get_hpd;
2248 hdata->default_bpp = pdata->bpp;
2249 hdata->dev = dev; 2248 hdata->dev = dev;
2250 2249
2251 ret = hdmi_resources_init(hdata); 2250 ret = hdmi_resources_init(hdata);
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h
index 70c0f7e7db82..44f79cf468d4 100644
--- a/include/drm/exynos_drm.h
+++ b/include/drm/exynos_drm.h
@@ -197,16 +197,14 @@ struct exynos_drm_common_hdmi_pd {
197/** 197/**
198 * Platform Specific Structure for DRM based HDMI core. 198 * Platform Specific Structure for DRM based HDMI core.
199 * 199 *
200 * @timing: default video mode for initializing
201 * @default_win: default window layer number to be used for UI.
202 * @bpp: default bit per pixel.
203 * @is_v13: set if hdmi version 13 is. 200 * @is_v13: set if hdmi version 13 is.
201 * @cfg_hpd: function pointer to configure hdmi hotplug detection pin
202 * @get_hpd: function pointer to get value of hdmi hotplug detection pin
204 */ 203 */
205struct exynos_drm_hdmi_pdata { 204struct exynos_drm_hdmi_pdata {
206 struct fb_videomode timing; 205 bool is_v13;
207 unsigned int default_win; 206 void (*cfg_hpd)(bool external);
208 unsigned int bpp; 207 int (*get_hpd)(void);
209 unsigned int is_v13:1;
210}; 208};
211 209
212#endif /* __KERNEL__ */ 210#endif /* __KERNEL__ */