diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 15:01:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 15:01:02 -0800 |
| commit | ecdca043ebe8e3172e0400d0966831e2e60870a0 (patch) | |
| tree | c1433e2399f544970e1f9ae7a469dbc9172c8e9f /drivers/gpu/drm/exynos/exynos_drm_connector.c | |
| parent | bb3215e97bb1ab917ed858322a9399fb32e69e49 (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
Merge 3.7-rc5 into driver-core-next
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_connector.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_connector.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index 18c271862ca8..0f68a2872673 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -374,6 +374,7 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev, exynos_connector->encoder_id = encoder->base.id; exynos_connector->manager = manager; exynos_connector->dpms = DRM_MODE_DPMS_OFF; + connector->dpms = DRM_MODE_DPMS_OFF; connector->encoder = encoder; err = drm_mode_connector_attach_encoder(connector, encoder); |