xf86-video-intel: src/i830_driver.c
Jesse Barnes
jbarnes at kemper.freedesktop.org
Wed Jun 24 14:43:33 PDT 2009
src/i830_driver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f0270bbb47baed78a0ff6189ae20d3ac322ec02b
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Wed Jun 24 14:42:08 2009 -0700
Fix i830_crtc_on to only check outputs associated with the given CRTC
Otherwise we may end up returning a false positive if some other output & crtc
are on, but not the one in question, again leading to hangs.
Reported-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
diff --git a/src/i830_driver.c b/src/i830_driver.c
index b9b9d0b..23690cf 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2468,7 +2468,8 @@ Bool i830_crtc_on(xf86CrtcPtr crtc)
/* Kernel manages CRTC status based out output config */
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
- if (drmmode_output_dpms_status(output) == DPMSModeOn)
+ if (output->crtc == crtc &&
+ drmmode_output_dpms_status(output) == DPMSModeOn)
active_outputs++;
}
More information about the xorg-commit
mailing list