The patch titled tridentfb: register should be left in non-locked state has been added to the -mm tree. Its filename is tridentfb-register-should-be-left-in-non-locked-state.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tridentfb: register should be left in non-locked state From: Krzysztof Helt <krzysztof.h1@xxxxx> Remove locking registers after they are unlocked during switch to/from MMIO mode. This fixes regression on the Blade3D (Trident 9880) caused by the previous patch (probe fixes). Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/tridentfb.c | 12 ------------ 1 file changed, 12 deletions(-) diff -puN drivers/video/tridentfb.c~tridentfb-register-should-be-left-in-non-locked-state drivers/video/tridentfb.c --- a/drivers/video/tridentfb.c~tridentfb-register-should-be-left-in-non-locked-state +++ a/drivers/video/tridentfb.c @@ -566,44 +566,32 @@ static inline void write3CE(int reg, uns static void enable_mmio(void) { - unsigned char tmp; - /* Goto New Mode */ outb(0x0B, 0x3C4); inb(0x3C5); /* Unprotect registers */ outb(NewMode1, 0x3C4); - tmp = inb(0x3C5); outb(0x80, 0x3C5); /* Enable MMIO */ outb(PCIReg, 0x3D4); outb(inb(0x3D5) | 0x01, 0x3D5); - - t_outb(NewMode1, 0x3C4); - t_outb(tmp, 0x3C5); } static void disable_mmio(void) { - unsigned char tmp; - /* Goto New Mode */ t_outb(0x0B, 0x3C4); t_inb(0x3C5); /* Unprotect registers */ t_outb(NewMode1, 0x3C4); - tmp = t_inb(0x3C5); t_outb(0x80, 0x3C5); /* Disable MMIO */ t_outb(PCIReg, 0x3D4); t_outb(t_inb(0x3D5) & ~0x01, 0x3D5); - - outb(NewMode1, 0x3C4); - outb(tmp, 0x3C5); } #define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F) _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are tridentfb-register-should-be-left-in-non-locked-state.patch pm2fb-correct-error-values-returned-from-probe-function.patch pm2fb-change-option-mode-to-mode_option.patch tridentfb-change-option-mode-to-mode_option.patch pm3fb-change-option-mode-to-mode_option.patch update-modedbtxt-documentation-about-mode_option-parameter-change.patch vt8623fb-change-option-mode-to-mode_option.patch arkfb-add-option-mode_option.patch s3fb-add-option-mode_option.patch fbdev-add-removed-option-mode-to-keep-compatibility.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html