diff options
| author | Alan Cox | 2011-07-15 18:35:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-15 19:05:08 +0200 |
| commit | 3caa89e933646263cb4efedd5660dba00a107b51 (patch) | |
| tree | 79fc0790523e21665c231244ea1855b51c9d9f12 /drivers/staging/gma500/mdfld_output.c | |
| parent | gma500: Use the mrst helpers and power control for mode commit (diff) | |
| download | kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.tar.gz kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.tar.xz kernel-qcow2-linux-3caa89e933646263cb4efedd5660dba00a107b51.zip | |
gma500: resync with Medfield progress
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/mdfld_output.c')
| -rw-r--r-- | drivers/staging/gma500/mdfld_output.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/gma500/mdfld_output.c b/drivers/staging/gma500/mdfld_output.c index 7e11401d67bb..ffa2c1f0c192 100644 --- a/drivers/staging/gma500/mdfld_output.c +++ b/drivers/staging/gma500/mdfld_output.c @@ -100,7 +100,6 @@ static int init_panel(struct drm_device *dev, int mipi_pipe, int p_type) mdfld_dsi_output_init(dev, mipi_pipe, NULL, p_cmd_funcs, NULL); break; case PYR_VID: - /*pyr_vid_init(dev, p_vid_funcs); */ mdfld_dsi_output_init(dev, mipi_pipe, NULL, NULL, p_vid_funcs); break; case TPO: /* TPO panel supports both cmd & vid interfaces */ @@ -135,10 +134,15 @@ int mdfld_output_init(struct drm_device *dev) dev_info(dev->dev, "panel 1: type is %d\n", type); init_panel(dev, 0, type); +#ifdef CONFIG_MDFD_DUAL_MIPI /* MIPI panel 2 */ type = mdfld_get_panel_type(dev, 2); dev_info(dev->dev, "panel 2: type is %d\n", type); init_panel(dev, 2, type); - +#endif +#ifdef CONFIG_MDFD_HDMI + /* HDMI panel */ + init_panel(dev, 0, HDMI); +#endif return 0; } |