diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-03 23:06:14 +0000 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2011-05-29 23:11:48 +0100 |
| commit | dd72c3e2a471d90678f876cb2c6ef3073c151a51 (patch) | |
| tree | 9d69f92966bd5b4ab9f26a395a260e213d1f98c1 | |
| parent | 0068a81d7c3f55157a379ab2c0a1023965904c4f (diff) | |
If the crtc is not enabled, then it can't be on
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 6d50f5a140dbefdf86eb25d18d08473aa7e42acc)
Conflicts:
src/intel_driver.c
| -rw-r--r-- | src/intel_driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 4fcd21aa..7ca802a5 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -2047,6 +2047,9 @@ Bool intel_crtc_on(xf86CrtcPtr crtc) if (intel->use_drm_mode) { int i, active_outputs = 0; + if (!crtc->enabled) + return FALSE; + /* Kernel manages CRTC status based out output config */ for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; @@ -2061,6 +2064,9 @@ Bool intel_crtc_on(xf86CrtcPtr crtc) } else { I830CrtcPrivatePtr intel_crtc = crtc->driver_private; + if (!crtc->enabled) + return FALSE; + if (intel_crtc->dpms_mode == DPMSModeOn) return TRUE; return FALSE; |