The patch titled
intelfb: Use firmware EDID for mode database
has been removed from the -mm tree. Its filename is
intelfb-use-firmware-edid-for-mode-database.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: intelfb: Use firmware EDID for mode database
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
Use firmware EDID for the driver's private mode database.
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Cc: Sylvain Meyer <sylvain.meyer@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/intelfb/intelfbdrv.c | 36 ++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff -puN drivers/video/intelfb/intelfbdrv.c~intelfb-use-firmware-edid-for-mode-database drivers/video/intelfb/intelfbdrv.c
--- devel/drivers/video/intelfb/intelfbdrv.c~intelfb-use-firmware-edid-for-mode-database 2006-05-27 22:05:52.000000000 -0700
+++ devel-akpm/drivers/video/intelfb/intelfbdrv.c 2006-05-27 22:06:00.000000000 -0700
@@ -131,6 +131,7 @@
#include "intelfb.h"
#include "intelfbhw.h"
+#include "../edid.h"
static void __devinit get_initial_mode(struct intelfb_info *dinfo);
static void update_dinfo(struct intelfb_info *dinfo,
@@ -1029,13 +1030,42 @@ intelfb_init_var(struct intelfb_info *di
sizeof(struct fb_var_screeninfo));
msrc = 5;
} else {
+ const u8 *edid_s = fb_firmware_edid(&dinfo->pdev->dev);
+ u8 *edid_d = NULL;
+
+ if (edid_s) {
+ edid_d = kmalloc(128, GFP_KERNEL);
+
+ if (edid_d) {
+ memcpy(edid_d, edid_s, 128);
+ fb_edid_to_monspecs(edid_d,
+ &dinfo->info->monspecs);
+ kfree(edid_d);
+ }
+ }
+
if (mode) {
+ printk("intelfb: Looking for mode in private "
+ "database\n");
msrc = fb_find_mode(var, dinfo->info, mode,
- vesa_modes, VESA_MODEDB_SIZE,
+ dinfo->info->monspecs.modedb,
+ dinfo->info->monspecs.modedb_len,
NULL, 0);
- if (msrc)
- msrc |= 8;
+
+ if (msrc != 1) {
+ printk("intelfb: No mode in private database, "
+ "intelfb: looking for mode in global "
+ "database ");
+ msrc = fb_find_mode(var, dinfo->info, mode,
+ vesa_modes,
+ VESA_MODEDB_SIZE, NULL, 0);
+
+ if (msrc)
+ msrc |= 8;
+ }
+
}
+
if (!msrc) {
msrc = fb_find_mode(var, dinfo->info, PREFERRED_MODE,
vesa_modes, VESA_MODEDB_SIZE,
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
fbcon-fix-scrollback-with-logo-issue-immediately-after-boot.patch
savagefb-allocate-space-for-current-and-saved-register.patch
savagefb-add-state-save-and_restore-hooks.patch
savagefb-add-state-save-and_restore-hooks-fix.patch
fbdev-more-accurate-sync-range-extrapolation.patch
nvidiafb-revise-pci_device_id-table.patch
atyfb-fix-hardware-cursor-handling.patch
atyfb-remove-unneeded-calls-to-wait_for_idle.patch
atyfb-set-correct-acceleration-flags.patch
epson1355fb-update-platform-code.patch
vesafb-update-platform-code.patch
vfb-update-platform-code.patch
vga16fb-update-platform-code.patch
fbdev-static-pseudocolor-with-depth-less-than-4-does.patch
savagefb-whitespace-cleanup.patch
fbdev-firmware-edid-fixes.patch
nvidiafb-add-support-for-geforce-6100-and-related-chipsets.patch
vesafb-fix-return-code-of-vesafb_setcolreg.patch
vesafb-prefer-vga-registers-over-pmi.patch
atyfb-fix-dead-code.patch
fbdev-coverity-bug-85.patch
fbdev-coverity-bug-90.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
