IBM (and other) quirks mixed up?

[Zack Cerza]

(Sorry, thunderbird just ate my lunch there. Here's some plaintext mail 
for ya.)

Hi,

I've been investigating why suspend to RAM stopped working somewhere 
between FC6 and the F7 test releases on my Thinkpad X41 (non-tablet), 
which has an i915 for video. The answer so far has been a combination of 
kernel, pm-utils and hal issues, and while I'm close-ish to having it 
work again, I did notice something weird in hal. Back in the FC5/6 days, 
I used ThinkWiki's page [0] to help me fix a problem I had with the 
display not turning back off on resume from RAM. A note on that page says:

    " On X40s/X41s - even with Intel Extreme Graphics - and for R52s 
with Intel Graphics Media Accelerator 900 the solution for ATI graphics 
chips above is reported to work. In this case, make sure no changes to 
VBE are made, especially no state saves and no reposts."

The solution for ATI chips they recommended was the s3_bios quirk. Only 
the IBM quirks file [1] lists the quirks for my laptop (2525) as 
vbe_post and vbestate_restore. I don't know if there are somehow other 
2525s that need those quirks and not s3_bios, but I do know the current 
fdi file is broken for mine.

 >From [2]:
  516     // X41
  517     { "IBM",            "1864*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
  518     { "IBM",            "1865*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
  519     { "IBM",            "2525*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
  520     { "IBM",            "2526*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
  521     { "IBM",            "2527*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
  522     { "IBM",            "2528*",        "",    "", 
VBE_POST|VBE_SAVE|UNSURE },
I'm guessing this is where hal's information comes from, but the lack of 
a confirmation note in that file, together with the 'UNSURE' note 
suggests to me that maybe we can change this safely. In fact, a *lot* of 
the entries in that file are 'UNSURE', and also coincidentally list the 
VBE_POST and VBE_SAVE quirks. I wonder if those are wrong, too.

As an aside, something's wrong with this picture (from [1]):
  25       <!-- T42p -->
  26       <match key="smbios.system.product" prefix="2371">
  27         <match key="smbios.system.version" string="ThinkPad X40">
  28           <merge key="power_management.quirk.s3_bios" 
type="bool">true</merge>
  29           <merge key="power_management.quirk.s3_mode" 
type="bool">true</merge>
  30         </match>
  31       </match>

Which model is that again? ;)

Zack

[0] 
http://www.thinkwiki.org/wiki/Problem_with_display_remaining_black_after_resume#Solution_for_ThinkPads_with_ATI_graphic_chips_and_Intel_915.2F945GM
[1] 
http://gitweb.freedesktop.org/?p=hal-info.git;a=blob;hb=HEAD;f=fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
[2] 
http://suspend.cvs.sourceforge.net/suspend/suspend/whitelist.c?view=markup