aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2011-12-15 15:53:24 -0500
committerDave Airlie <airlied@redhat.com>2011-12-20 15:27:25 -0500
commitc75488376a55c207172f78664d600b87df88107f (patch)
treef2eee28c4b4718313c0907d9bd93a17d3643dc1e
parent06e4cd64174b48345cbd99179b780a2bf4f96ab6 (diff)
drm: call connector dpms fxn, when setting config
Call connector->funcs->dpms(DPMS_ON) rather than just setting connector->dpms = DPMS_ON. This ensures that if the connector has something to do to enable the output (rather than just using drm_helper_connector_dpms helper directly), that this happens at bootup. This solves an issue with connectors not getting enabled from fbcon_init() when the driver is loaded. Signed-off-by: Rob Clark <rob@ti.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 42f86e71479..0cd2ba19bad 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -711,7 +711,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
711 for (i = 0; i < set->num_connectors; i++) { 711 for (i = 0; i < set->num_connectors; i++) {
712 DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id, 712 DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
713 drm_get_connector_name(set->connectors[i])); 713 drm_get_connector_name(set->connectors[i]));
714 set->connectors[i]->dpms = DRM_MODE_DPMS_ON; 714 set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
715 } 715 }
716 } 716 }
717 drm_helper_disable_unused_functions(dev); 717 drm_helper_disable_unused_functions(dev);