Re: [GIT PULL] fbdev changes for 3.12

Hi Linus,

On Thu, 5 Sep 2013 09:48:18 +0200 David Herrmann [off-list ref] wrote:

On Thu, Sep 5, 2013 at 8:48 AM, Tomi Valkeinen [off-list ref] wrote:

quoted

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

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 <redacted>
Date: Wed, 14 Aug 2013 14:29:27 +1000
Subject: [PATCH] simplefb: merge conflict fix

Signed-off-by: Stephen Rothwell <redacted>
---
 include/linux/platform_data/simplefb.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h
index 53774b0..c395d4c 100644
--- a/include/linux/platform_data/simplefb.h
+++ b/include/linux/platform_data/simplefb.h

@@ -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 }, \
 }
 
 /*

-- 
1.8.4.rc0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au