fbdev changes for 3.12
Subsystems (2)
Hi Linus,
Here are the fbdev changes for 3.12.
There's a conflict in drivers/video/simplefb.c, which you can resolve by using the version in your tree.
I guess the simplefb changes were taken through Ingo's tree because the series includes x86 arch changes, but it would have been nice to see the patches in the linux-next...
Tomi
The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/fbdev-3.12
for you to fetch changes up to 028cd86b794f4a7f09525587c8e9ab6b03a6fa0f:
video: da8xx-fb: fix the polarities of the hsync/vsync pulse (2013-08-30 14:51:30 +0300)
----------------------------------------------------------------
fbdev changes for 3.12:
* Improvements to da8xx-fb to make it support v2 of the LCDC IP, used e.g. in BeagleBone
* Himax HX8369 controller support
* Various small fixes and cleanups
----------------------------------------------------------------
Afzal Mohammed (11):
video: da8xx-fb: fb_check_var enhancement
video: da8xx-fb: simplify lcd_reset
video: da8xx-fb: use modedb helper to update var
video: da8xx-fb: remove unneeded "var" initialization
video: da8xx-fb: store current display information
video: da8xx-fb: store clk rate even if !CPUFREQ
video: da8xx-fb: store struct device *
video: da8xx-fb: report correct pixclock
video: da8xx-fb: enable sync lost intr for v2 ip
video: da8xx-fb: ensure non-null cfg in pdata
video: da8xx-fb: reorganize panel detection
Alexandre Belloni (1):
fb: backlight: HX8357: Add HX8369 support
Alexandre Courbot (1):
simplefb: add support for a8b8g8r8 pixel format
Alexandru Juncu (1):
matroxfb: replace kmalloc and memset with kzalloc.
Boris BREZILLON (1):
at91/avr32/atmel_lcdfb: prepare clk before calling enable
Chen Gang (1):
drivers: video: fbcmap: remove the redundency and incorrect checkings
Daniel Mack (1):
fbmem: move EXPORT_SYMBOL annotation next to symbol declarations
Darren Etheridge (13):
video: da8xx-fb: pix clk and clk div handling cleanup
video: da8xx-fb: fb_set_par support
video: da8xx-fb: improve readability of code
video: da8xx-fb: fix 24bpp raster configuration
video: da8xx-fb: use devres
video: da8xx-fb: set upstream clock rate (if reqd)
video: da8xx-fb: make clock naming consistent
video: da8xx-fb: let compiler decide what to inline
video: da8xx-fb: adding am33xx as dependency
video: da8xx-fb fixing incorrect porch mappings
video: da8xx-fb: fixing timing off by one errors
video: da8xx-fb: support lcdc v2 timing register expansion
video: da8xx-fb: fix the polarities of the hsync/vsync pulse
Fabio Estevam (1):
video: mxsfb: Let device core handle pinctrl
Greg Kroah-Hartman (1):
video: output: convert class code to use dev_groups
Julia Lawall (2):
video: mxsfb: simplify use of devm_ioremap_resource
video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource
Mark Brown (1):
video: exynos: Ensure definitions match prototypes
Maxime Ripard (1):
video: hx8357: Make IM pins optional
Michael Opdenacker (1):
drivers/video: remove unused parameter in Kconfig
Mythri P K (1):
OMAPDSS: HDMI: Fix AVI infoframe bug
Peter Jones (1):
Release efifb's colormap in efifb_destroy()
Shingo Nakao (1):
backlight: lp855x: set zero brightness at FBBLANK
Tomi Valkeinen (3):
Merge branch '3.12/da8xx' into 3.12/fbdev
OMAPDSS: HDMI: Fix possible NULL reference
OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file
.../bindings/video/simple-framebuffer.txt | 1 + drivers/video/Kconfig | 15 +- drivers/video/atmel_lcdfb.c | 8 +- drivers/video/backlight/hx8357.c | 269 ++++++++++++-- drivers/video/backlight/lp855x_bl.c | 2 +- drivers/video/da8xx-fb.c | 387 ++++++++++++--------- drivers/video/efifb.c | 1 + drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 1 + drivers/video/fbcmap.c | 7 +- drivers/video/fbmem.c | 29 +- drivers/video/matrox/matroxfb_base.c | 3 +- drivers/video/mxsfb.c | 15 +- drivers/video/omap2/dss/hdmi.c | 5 +- drivers/video/omap2/dss/manager-sysfs.c | 8 +- drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 42 ++- drivers/video/output.c | 20 +- drivers/video/simplefb.c | 1 + drivers/video/xilinxfb.c | 8 +- include/video/da8xx-fb.h | 5 + 19 files changed, 542 insertions(+), 285 deletions(-)
Hi Tomi
Quoted 6 lines · Tomi Valkeinen
Hi Linus,
Here are the fbdev changes for 3.12.
There's a conflict in
drivers/video/simplefb.c, which you can resolve by using the version in your tree.
No, both need to be merged. The current version lacks support for ABGR8888. The fbdev tree lacks the DRM format, which should be:
{ "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }
Quoted 3 lines
I guess the simplefb changes were taken through Ingo's tree because the series includes x86 arch changes, but it would have been nice to see the patches in the linux-next...
simplefb was in linux-next. I also acked the fixup from Stephen. See this commit from a pre-3.12 -next tree:
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/platform_data/simplefb.h?idDed8fb588e517a2ef917c6757ee11ee47348978
It was merged through -tip around 1 month ago. It does mainly change the way x86 provides firmware-fb information to drivers so -tip seemed fine to me.
On another note, could you have a look at:
[PATCH] efifb: prevent null dereferences by removing unused array
indices from dmi_list
That somehow didn't make it in your fbdev-next pull.
Thanks
David
Hi Linus,
Quoted 12 lines · On Thu, 5 Sep 2013 09:48:18 +0200 David Herrmann <[email protected]> wrote:
Quoted 5 lines · Tomi Valkeinen
Here are the fbdev changes for 3.12.
There's a conflict in
drivers/video/simplefb.c, which you can resolve by using the version in your tree.No, both need to be merged. The current version lacks support for ABGR8888. The fbdev tree lacks the DRM format, which should be:
{ "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8},DRM_FORMAT_ABGR8888}
Quoted 7 lines
Quoted 3 lines
I guess the simplefb changes were taken through Ingo's tree because the series includes x86 arch changes, but it would have been nice to see the patches in the linux-next...
simplefb was in linux-next. I also acked the fixup from Stephen. See this commit from a pre-3.12 -next tree:
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/platform_data/simplefb.h?id=44ed8fb588e517a2ef917c6757ee11ee47348978
In case it is not obvious, this is the extra merge fix patch I have been carrying (after using the version of drivers/video/simplefb.c from the tip tree - which is already in your tree):
From: Stephen Rothwell <[email protected]>
Date: Wed, 14 Aug 2013 14:29:27 +1000
Subject: [PATCH] simplefb: merge conflict fix
--- include/linux/platform_data/simplefb.h | 1 + 1 file changed, 1 insertion(+)
include/linux/platform_data/simplefb.h +1 -0
@@ -27,6 +27,7 @@ { "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \ { "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \ { "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \ + { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \ }/*
Signature · 5 lines
1.8.4.rc0 -- Cheers, Stephen Rothwell [email protected]
Quoted 6 lines · David Herrmann
Quoted 2 lines
There's a conflict in
drivers/video/simplefb.c, which you can resolve by using the version in your tree.No, both need to be merged. The current version lacks support for ABGR8888. The fbdev tree lacks the DRM format, which should be:
{ "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8},DRM_FORMAT_ABGR8888}
Ah, right you are. a8b8g8r8 looks too much like a8r8g8b8, so my morning groggy eyes didn't see that.
Quoted 7 lines
Quoted 3 lines
I guess the simplefb changes were taken through Ingo's tree because the series includes x86 arch changes, but it would have been nice to see the patches in the linux-next...
simplefb was in linux-next. I also acked the fixup from Stephen. See this commit from a pre-3.12 -next tree:
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/platform_data/simplefb.h?id=44ed8fb588e517a2ef917c6757ee11ee47348978
Right. And I have the mail about the conflict from Stephen in my mailbox, which I had read, but successfully forgot about it during my vacation.
So, what I said about conflict resolution and the series missing from linux-next was wrong, and the conflict resolution in linux-next is what should be used.
Tomi