]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm: call connector dpms fxn, when setting config
authorRob Clark <rob@ti.com>
Thu, 15 Dec 2011 20:53:24 +0000 (14:53 -0600)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Dec 2011 20:27:25 +0000 (20:27 +0000)
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>
drivers/gpu/drm/drm_crtc_helper.c

index 42f86e71479a13cf2b67f906694e62fa751a57b2..0cd2ba19bad10c2e99bc88a92f00a5a4c536f106 100644 (file)
@@ -711,7 +711,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);