Bug 14980

after actually reading the commit log, I tried to switch terminal (ALT+CTRL+F1) after hibernation, and..... the problem is still here (restarting Xorg works of course)

Created attachment 15212 [details] [review]
this fix the vt switching crash that happens with compiz activated

I believe this is the same issue as I have except in my case using compiz it makes X crash. This patch fixed it for me. Basically it add RADEONRestoreMemMapRegisters(pScrn, info->ModeReg); even for dri on PCIE  like I believe was the case when the restore code was in atombios_crtc and legacycrtc .

Could you test to confirm this is the same issue ?

(In reply to comment #2)
> Created an attachment (id=15212) [details]
> this fix the vt switching crash that happens with compiz activated
> 
> I believe this is the same issue as I have except in my case using compiz it
> makes X crash. This patch fixed it for me. Basically it add
> RADEONRestoreMemMapRegisters(pScrn, info->ModeReg); even for dri on PCIE  like
> I believe was the case when the restore code was in atombios_crtc and
> legacycrtc .
> 
> Could you test to confirm this is the same issue ?
> 

Confirmed! The patch fixes the issue. Thanks!

(In reply to comment #3)
> Confirmed! The patch fixes the issue. Thanks!
> 
please don't close the bug until a fix is actually applied, thanks (afaics this isn't the case here).

(In reply to comment #4)
> (In reply to comment #3)
> > Confirmed! The patch fixes the issue. Thanks!
> > 
> please don't close the bug until a fix is actually applied, thanks (afaics this
> isn't the case here).
> 

Oops, sorry. I did not know the exact rules for closing a bug.

Created attachment 15230 [details] [review]
possible fix

(In reply to comment #2)
> Created an attachment (id=15212) [details]
> this fix the vt switching crash that happens with compiz activated
> 
> I believe this is the same issue as I have except in my case using compiz it
> makes X crash. This patch fixed it for me. Basically it add
> RADEONRestoreMemMapRegisters(pScrn, info->ModeReg); even for dri on PCIE  like
> I believe was the case when the restore code was in atombios_crtc and
> legacycrtc .

RADEONRestoreMemMapRegisters() gets called via RADEONAdjustMemMapRegisters() if the DRI is enabled regardless of whether the card is PCIE or not.  The ordering is  apparently causing the problem.  Does this patch work?

(In reply to comment #6)
> Created an attachment (id=15230) [details]
> possible fix
> 
> (In reply to comment #2)
> > Created an attachment (id=15212) [details] [details]
> > this fix the vt switching crash that happens with compiz activated
> > 
> > I believe this is the same issue as I have except in my case using compiz it
> > makes X crash. This patch fixed it for me. Basically it add
> > RADEONRestoreMemMapRegisters(pScrn, info->ModeReg); even for dri on PCIE  like
> > I believe was the case when the restore code was in atombios_crtc and
> > legacycrtc .
> 
> RADEONRestoreMemMapRegisters() gets called via RADEONAdjustMemMapRegisters() if
> the DRI is enabled regardless of whether the card is PCIE or not.  The ordering
> is  apparently causing the problem.  Does this patch work?
> 

Unfortunately, no. It is actually worse, since Xorg is broken after resume (the mouse cursor displays fine, but the windows are corrupted ( something like the lines are interleaved)

my relevant xorg bits, just in case:
Section "Device"
        Identifier      "ATI Technologies Inc RV350 [Mobility Radeon 9600 M10]"
        Driver          "ati"
        BusID           "PCI:1:0:0"
        Option          "GARTSize" "64"
        Option          "XAANoOffscreenPixmaps" "true"
        Option          "AGPMode" "4"
        Option          "EnablePageFlip" "true"
        Option          "DynamicClocks" "true"
EndSection

(In reply to comment #7)

> Unfortunately, no. It is actually worse, since Xorg is broken after resume (the
> mouse cursor displays fine, but the windows are corrupted ( something like the
> lines are interleaved)

Can you attach your logs in both the working and non-working cases?

Created attachment 15231 [details]
Xorg log (non working patch)

Created attachment 15232 [details]
Xorg log (working patch)

here are the logs

Created attachment 15234 [details] [review]
possible fix

How about this patch?

(In reply to comment #11)
> Created an attachment (id=15234) [details]
> possible fix
> 
> How about this patch?
> 

no luck either. Xorg hibernation is not broken anymore, but I still get drmRadeonCmdBuffer: -22 from glxgears. Xor log following...

Created attachment 15236 [details]
Xorg log (2nd non-working patch)

Created attachment 15239 [details] [review]
possible fix

How about this one?

(In reply to comment #14)
> Created an attachment (id=15239) [details]
> possible fix
> 
> How about this one?
> 

sorry, no, it doesn't work. Same error message.

I went ahead and pushed Alban's fix.  This should restore the old behavior.  I'm not sure why you need to do it twice...

f71ac0e40b9d950bcb3bba42a75d41f45b6ed1bf