aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c13
1 files changed, 6 insertions, 7 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);