aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-02 15:54:27 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-06 01:59:42 -0400
commit0a91ca29215a41760cca03999498959d0e05d9b3 (patch)
tree48ef24cb35243dbb69c2d10fef3eb843f52bc2b3 /drivers/gpu/drm/i915/intel_dp.c
parent24929352481f085c5f85d4d4cbc919ddf106d381 (diff)
drm/i915: check connector hw/sw state
Atm we can only check the connector state after a dpms call - while doing modeset with the copy&pasted crtc helper code things are too ill-defined for proper checking. But the idea is very much to call this check from the modeset code, too. v2: Fix dpms check and don't presume that if the hw isn't on that it must not be linked up with an encoder (it could simply be switched off with the dpms state). Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e3928b922825..96fd1e7ff02e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1367,6 +1367,8 @@ intel_dp_dpms(struct drm_connector *connector, int mode)
1367 intel_encoder_dpms(&intel_dp->base, mode); 1367 intel_encoder_dpms(&intel_dp->base, mode);
1368 WARN_ON(intel_dp->dpms_mode != DRM_MODE_DPMS_ON); 1368 WARN_ON(intel_dp->dpms_mode != DRM_MODE_DPMS_ON);
1369 } 1369 }
1370
1371 intel_connector_check_state(to_intel_connector(connector));
1370} 1372}
1371 1373
1372/* 1374/*