diff mbox

drm: call connector dpms fxn, when setting config

Message ID 1323982404-22396-1-git-send-email-rob.clark@linaro.org
State Accepted
Commit c75488376a55c207172f78664d600b87df88107f
Headers show

Commit Message

Rob Clark Dec. 15, 2011, 8:53 p.m. UTC 
From: Rob Clark <rob@ti.com>

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>
---
 drivers/gpu/drm/drm_crtc_helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Adam Jackson Dec. 15, 2011, 9:09 p.m. UTC | #1 
On Thu, 2011-12-15 at 14:53 -0600, Rob Clark wrote:
> From: Rob Clark <rob@ti.com>
> 
> 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>

- ajax
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index d2619d7..2f1ec7c 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -710,7 +710,7 @@  int drm_crtc_helper_set_config(struct drm_mode_set *set)
 			for (i = 0; i < set->num_connectors; i++) {
 				DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
 					      drm_get_connector_name(set->connectors[i]));
-				set->connectors[i]->dpms = DRM_MODE_DPMS_ON;
+				set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
 			}
 		}
 		drm_helper_disable_unused_functions(dev);