also sprach Raúl Sánchez Siles <rasasi78@gmail.com> [2007.07.04.0055 +0200]:
> I've read the bug report and it seems that it corresponds to the upstream
> bug https://bugs.freedesktop.org/show_bug.cgi?id=11432 which is still open.
>
> This upstream bug is reproducible in my system using July 2nd git version.
> My system: Dell inspiron 510m, Intel 855GM and unstable. The problem in case
> it exists should be easily repeatable just pressing the lid close button in
> the middle of an Xorg session. In my case it even happens on the kdm logon
> screen.
>
> Could you please if this stills happen to you using the experimental version
> of the driver?
I found a patch that is not yet upstream. Does this fix it?
From 1442fe79f2add91ba6df2417ad75243ed65952c7 Mon Sep 17 00:00:00 2001
From: martin f. krafft <madduck@lapse.madduck.net>
Date: Mon, 18 Jun 2007 13:35:18 +0100
Subject: [PATCH] only run dpms on code on 9xx
---
src/i830_display.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/i830_display.c b/src/i830_display.c
index adc7479..6965337 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -958,11 +958,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
else
pipeconf &= ~PIPEACONF_DOUBLE_WIDE;
}
-#if 1
- dspcntr |= DISPLAY_PLANE_ENABLE;
- pipeconf |= PIPEACONF_ENABLE;
- dpll |= DPLL_VCO_ENABLE;
-#endif
+ /*
+ * This "shouldn't" be needed as the dpms on code
+ * will be run after the mode is set. On 9xx, it helps.
+ * On 855, it can lock up the chip (and the entire machine)
+ */
+ if (IS_I9XX (pI830))
+ {
+ dspcntr |= DISPLAY_PLANE_ENABLE;
+ pipeconf |= PIPEACONF_ENABLE;
+ dpll |= DPLL_VCO_ENABLE;
+ }
/* Disable the panel fitter if it was on our pipe */
if (i830_panel_fitter_pipe (pI830) == pipe)
--
1.5.2.2
--
.''`. martin f. krafft <madduck@debian.org>
: :' : proud Debian developer, author, administrator, and user
`. `'` http://people.debian.org/~madduck - http://debiansystem.info
`- Debian - when you have better things to do than fixing systems
Attachment:
signature.asc
Description: Digital signature (GPG/PGP)