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_pyr_cmd.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_pyr_cmd.c')
-rw-r--r-- | drivers/staging/gma500/mdfld_pyr_cmd.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/staging/gma500/mdfld_pyr_cmd.c b/drivers/staging/gma500/mdfld_pyr_cmd.c index 0d89384fe37d..5f38e8df3759 100644 --- a/drivers/staging/gma500/mdfld_pyr_cmd.c +++ b/drivers/staging/gma500/mdfld_pyr_cmd.c @@ -188,7 +188,7 @@ static void pyr_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config, dev_dbg(dev->dev, "Init DBI interface on pipe %d...\n", pipe); - /* In-ready device */ + /* Un-ready device */ REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000); /* Init dsi adapter before kicking off */ @@ -394,25 +394,13 @@ static void pyr_dsi_dbi_dpms(struct drm_encoder *encoder, int mode) struct mdfld_dsi_dbi_output *dbi_output = MDFLD_DSI_DBI_OUTPUT(dsi_encoder); struct drm_device *dev = dbi_output->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - static bool bdispoff; dev_dbg(dev->dev, "%s\n", (mode == DRM_MODE_DPMS_ON ? "on" : "off")); - if (mode == DRM_MODE_DPMS_ON) { - if (/*gbgfxsuspended && */bdispoff) { - bdispoff = false; - dev_priv->dispstatus = true; - /*gbgfxsuspended = false; - */ - mdfld_dsi_dbi_exit_dsr(dev, MDFLD_DSR_2D_3D, 0, 0); - } + if (mode == DRM_MODE_DPMS_ON) pyr_dsi_dbi_set_power(encoder, true); - } else { - bdispoff = true; - dev_priv->dispstatus = false; + else pyr_dsi_dbi_set_power(encoder, false); - } } /* |