Xorg segfaults on i915gm during intel_drv.so init

[Jeremy Huddleston]

Can you try this?  It seems like this might be more correct (or simply less wrong...):

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index f9602fa..1b989bd 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -290,10 +290,10 @@ xf86RotateDestroy(xf86CrtcPtr crtc)
     /*
      * Clean up damage structures when no crtcs are rotated
      */
-    if (screenDrawable && xf86_config->rotation_damage) {
+    if (xf86_config->rotation_damage) {
         /* Free damage structure */
-        if (xf86_config->rotation_damage_registered) {
-            DamageUnregister(&pScreen->root->drawable,
+        if (screenDrawable && xf86_config->rotation_damage_registered) {
+            DamageUnregister(screenDrawable,
                              xf86_config->rotation_damage);
             xf86_config->rotation_damage_registered = FALSE;
             DisableLimitedSchedulingLatency();


On Apr 7, 2012, at 09:47, Knut Petersen wrote:

> Commit 55f552adb651715d2620db7248cd5b9b8187654a
> claims to "workaround crash on close".
> 
> Thats definitely true  -- it causes Xorg to crash on init here:
> 
>    Backtrace:
>    0: /usr/bin/Xorg (xorg_backtrace+0x38) [0x81dc174]
>    1: /usr/bin/Xorg (0x8048000+0x1986b3) [0x81e06b3]
>    2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb76ef40c]
>    3: /usr/bin/Xorg (xf86RotateDestroy+0x34) [0x8106ae0]
>    4: /usr/bin/Xorg (xf86CrtcRotate+0x117) [0x8106f10]
>    5: /usr/lib/xorg/modules/drivers/intel_drv.so (0xb6e36000+0xcda7) [0xb6e42da7]
>    6: /usr/lib/xorg/modules/drivers/intel_drv.so (0xb6e36000+0xd136) [0xb6e43136]
>    7: /usr/bin/Xorg (xf86CrtcSetModeTransform+0x1c3) [0x80f63e0]
>    8: /usr/bin/Xorg (xf86SetDesiredModes+0x252) [0x80fb2ea]
>    9: /usr/lib/xorg/modules/drivers/intel_drv.so (0xb6e36000+0x11ad3) [0xb6e47ad3]
>    10: /usr/lib/xorg/modules/drivers/intel_drv.so (0xb6e36000+0x1195a) [0xb6e4795a]
>    11: /usr/bin/Xorg (AddScreen+0x248) [0x807aec0]
>    12: /usr/bin/Xorg (InitOutput+0xf83) [0x80c4382]
>    13: /usr/bin/Xorg (0x8048000+0x1e05b) [0x806605b]
>    14: /lib/libc.so.6 (__libc_start_main+0xf3) [0xb70b3003]
>    15: /usr/bin/Xorg (0x8048000+0x1dd81) [0x8065d81]
> 
> cu,
> Knut
> 
> 
> Am 07.04.2012 17:19, schrieb Knut Petersen:
>> Xorg segfaults during startup, have a look at the attached log.
>> 
>> hardware: AOpen i915GMm-HFS (i915GM, Pentium M Dothan, 2 GHz, 2GB)
>> 
>> software: kernel 3.2.14 on openSuSE 12.1 system.
>> 
>> Xorg: Fresh git (last intel_drv commit:  1ecf17b2507f95e1fefea15833fa9f57ec256a2e)
>> 
>> Another Xorg fetched and compiled 5 days ago does not show this problem.
>> 
>> cu,
>> knut
>> 
>> 
>> 
>> _______________________________________________
>> xorg-devel at lists.x.org: X.Org development
>> Archives: http://lists.x.org/archives/xorg-devel
>> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>