The patch titled
x86-dont-probe-for-ddc-on-vbe12 fix
has been removed from the -mm tree. Its filename was
x86-dont-probe-for-ddc-on-vbe12-fix.patch
This patch was dropped because it was folded into x86-dont-probe-for-ddc-on-vbe12.patch
------------------------------------------------------
Subject: x86-dont-probe-for-ddc-on-vbe12 fix
From: Zwane Mwaikambo <zwane@xxxxxxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Tobias Hain <tobias.hain@xxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/boot/video.S | 4 ++--
arch/x86_64/boot/video.S | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN arch/i386/boot/video.S~x86-dont-probe-for-ddc-on-vbe12-fix arch/i386/boot/video.S
--- a/arch/i386/boot/video.S~x86-dont-probe-for-ddc-on-vbe12-fix
+++ a/arch/i386/boot/video.S
@@ -1956,8 +1956,8 @@ store_edid:
cmpw $0x004f, %ax
jne no_edid
- cmpw $0x0102, 4(%di) # only do EDID on > 1.2
- jle no_edid
+ cmpw $0x0200, 4(%di) # only do EDID on >= VBE2.0
+ jl no_edid
pushw %es # save ES
xorw %di, %di # Report Capability
diff -puN arch/x86_64/boot/video.S~x86-dont-probe-for-ddc-on-vbe12-fix arch/x86_64/boot/video.S
--- a/arch/x86_64/boot/video.S~x86-dont-probe-for-ddc-on-vbe12-fix
+++ a/arch/x86_64/boot/video.S
@@ -1956,8 +1956,8 @@ store_edid:
cmpw $0x004f, %ax
jne no_edid
- cmpw $0x0102, 4(%di) # only do EDID on > 1.2
- jle no_edid
+ cmpw $0x0200, 4(%di) # only do EDID on >= VBE2.0
+ jl no_edid
pushw %es # save ES
xorw %di, %di # Report Capability
_
Patches currently in -mm which might be from zwane@xxxxxxxxxxxxx are
git-agpgart.patch
fix-mtrr-compat-ioctl.patch
x86-dont-probe-for-ddc-on-vbe12.patch
x86-dont-probe-for-ddc-on-vbe12-fix.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
