The patch titled intelfb: fix color map setting with an LVDS display has been added to the -mm tree. Its filename is intelfb-fix-color-map-setting-with-an-lvds-display.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://userweb.kernel.org/~akpm/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: intelfb: fix color map setting with an LVDS display From: Krzysztof Helt <krzysztof.h1@xxxxx> Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13285 The intelfb driver sets color map depending on currently active pipe. However, if an LVDS display is attached (like in laptop) the active pipe variable is never set. The default value is PIPE_A and can be wrong. Set up the pipe variable during driver initialization after hardware state was read. I also found by experiment that if both pipes were enabled, the PIPE_B is used (active). The problem is visible in the 8 bpp mode if colors above 15 are used. The first 16 color entries are displayed correctly. Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Reported-by: Dean Menezes <samanddeanus@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/intelfb/intelfbdrv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN drivers/video/intelfb/intelfbdrv.c~intelfb-fix-color-map-setting-with-an-lvds-display drivers/video/intelfb/intelfbdrv.c --- a/drivers/video/intelfb/intelfbdrv.c~intelfb-fix-color-map-setting-with-an-lvds-display +++ a/drivers/video/intelfb/intelfbdrv.c @@ -871,6 +871,12 @@ static int __devinit intelfb_pci_registe intelfbhw_print_hw_state(dinfo, &dinfo->save_state); + /* Check whether pipe A or pipe B is enabled. */ + if (dinfo->save_state.pipe_a_conf & PIPECONF_ENABLE) + dinfo->pipe = PIPE_A; + if (dinfo->save_state.pipe_b_conf & PIPECONF_ENABLE) + dinfo->pipe = PIPE_B; + if (bailearly == 18) bailout(dinfo); _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are origin.patch linux-next.patch revert-fbdev-fix-info-lock-deadlock-in-fbcon_event_notify.patch revert-fbdev-uninline-lock_fb_info.patch revert-fbmem-fix-fb_info-lock-and-mm-mmap_sem-circular-locking-dependency.patch revert-fbmem-dont-call-copy_from-to_user-with-mutex-held.patch fbdev-move-back-to-bkl-solution.patch intelfb-fix-color-map-setting-with-an-lvds-display.patch chipsfb-remove-redundant-assignment.patch igafb-use-framebuffer_alloc-to-allocate-fb_info-struct.patch offb-use-framebuffer_alloc-to-allocate-fb_info-struct.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