summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_crt.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-02 21:54:27 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-06 07:59:42 +0200
commit0a91ca29215a41760cca03999498959d0e05d9b3 (patch)
tree48ef24cb35243dbb69c2d10fef3eb843f52bc2b3 /drivers/gpu/drm/i915/intel_crt.c
parent24929352481f085c5f85d4d4cbc919ddf106d381 (diff)
downloadblackbird-op-linux-0a91ca29215a41760cca03999498959d0e05d9b3.tar.gz
blackbird-op-linux-0a91ca29215a41760cca03999498959d0e05d9b3.zip
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_crt.c')
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index b0fadd00a4dc..c002d260c1a4 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -176,6 +176,8 @@ static void intel_crt_dpms(struct drm_connector *connector, int mode)
intel_crtc_update_dpms(crtc);
}
+
+ intel_connector_check_state(to_intel_connector(connector));
}
static int intel_crt_mode_valid(struct drm_connector *connector,
OpenPOWER on IntegriCloud