summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-06-17 15:34:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 17:33:37 -0700
commitc026a3f3972344d0adf8ae060cddc357096c9815 (patch)
treec8791540d6d64cc910cb18389b5eb4b2ea70e773 /drivers
parentb28e7d5807051184270c40d4bc48db947189f107 (diff)
downloadlinux-stable-c026a3f3972344d0adf8ae060cddc357096c9815.tar.gz
linux-stable-c026a3f3972344d0adf8ae060cddc357096c9815.tar.bz2
linux-stable-c026a3f3972344d0adf8ae060cddc357096c9815.zip
imx-drm: parallel-display: Fix DPMS default state.
If connector->dpms is left untouched, it defaults to DRM_MODE_DPMS_ON (0). As a result, drm_helper_connector_dpms will exit when it will be asked to set the state to DRM_MODE_DPMS_ON, because it is already set. That issue prevented displays from turning on at boot. Signed-off-by: Denis Carikli <denis@eukrea.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/imx-drm/parallel-display.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index b5678328fc40..4ca61afdf622 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -173,6 +173,13 @@ static int imx_pd_register(struct drm_device *drm,
if (ret)
return ret;
+ /* set the connector's dpms to OFF so that
+ * drm_helper_connector_dpms() won't return
+ * immediately since the current state is ON
+ * at this point.
+ */
+ imxpd->connector.dpms = DRM_MODE_DPMS_OFF;
+
drm_encoder_helper_add(&imxpd->encoder, &imx_pd_encoder_helper_funcs);
drm_encoder_init(drm, &imxpd->encoder, &imx_pd_encoder_funcs,
DRM_MODE_ENCODER_NONE);