[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-167-g2fa4caa
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-167-g2fa4caa
|
From: Sébastien S. <ss...@us...> - 2016-11-21 13:12:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, buildroot-update has been updated
via 2fa4caa0ed550a4ab3521c8651557565cc3898c3 (commit)
via 2fd315f8828d7548337296d900f0eb2fbef9fadb (commit)
from 1d53afe97730d7d9be4d9ae27ea8cbb8ea9f1d3b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2fa4caa0ed550a4ab3521c8651557565cc3898c3
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 21 14:12:07 2016 +0100
[LINUX] opos6ul: backport mainline patch to fix fb corruption
commit 2fd315f8828d7548337296d900f0eb2fbef9fadb
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 21 14:11:40 2016 +0100
[LINUX] opos6ul and opos6ul_recovery: bump to 4.8.10
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ul_recovery_defconfig | 2 +-
...ux-4.8.9.config => opos6ul-linux-4.8.10.config} | 0
patches/linux/{4.8.9 => 4.8.10} | 0
...mxsfb-Fix-framebuffer-corruption-on-mx6sx.patch | 62 ++++++++++++++++++++
5 files changed, 64 insertions(+), 2 deletions(-)
rename buildroot/target/device/armadeus/opos6ul/{opos6ul-linux-4.8.9.config => opos6ul-linux-4.8.10.config} (100%)
rename patches/linux/{4.8.9 => 4.8.10} (100%)
create mode 100644 patches/linux/4.8/0801-video-mxsfb-Fix-framebuffer-corruption-on-mx6sx.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index c799aa5..77dc6ac 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.10"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/opos6ul_recovery_defconfig b/buildroot/configs/opos6ul_recovery_defconfig
index 160c9c5..6235067 100644
--- a/buildroot/configs/opos6ul_recovery_defconfig
+++ b/buildroot/configs/opos6ul_recovery_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.10"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.9.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.9.config
rename to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.10.config
diff --git a/patches/linux/4.8.9 b/patches/linux/4.8.10
similarity index 100%
rename from patches/linux/4.8.9
rename to patches/linux/4.8.10
diff --git a/patches/linux/4.8/0801-video-mxsfb-Fix-framebuffer-corruption-on-mx6sx.patch b/patches/linux/4.8/0801-video-mxsfb-Fix-framebuffer-corruption-on-mx6sx.patch
new file mode 100644
index 0000000..7d2f9a3
--- /dev/null
+++ b/patches/linux/4.8/0801-video-mxsfb-Fix-framebuffer-corruption-on-mx6sx.patch
@@ -0,0 +1,62 @@
+From 03577d6a0beff2aded55d4ae40d1058905233536 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <ma...@de...>
+Date: Fri, 26 Aug 2016 17:53:35 +0200
+Subject: [PATCH] video: mxsfb: Fix framebuffer corruption on mx6sx
+
+Allocate the framebuffer memory as coherent, otherwise the framebuffer
+will suffer from artifacts when displaying scrolling text or video.
+This can be replicated on i.MX6SX (armv7), which has more complex memory
+architecture compared to the i.MX23/28 (armv5).
+
+Signed-off-by: Marek Vasut <ma...@de...>
+Cc: Tomi Valkeinen <tom...@ti...>
+Cc: Fabio Estevam <fab...@nx...>
+Cc: Lucas Stach <l....@pe...>
+Cc: Shawn Guo <sha...@ke...>
+Signed-off-by: Tomi Valkeinen <tom...@ti...>
+---
+ drivers/video/fbdev/mxsfb.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c
+index 4e6608c..7846f0e 100644
+--- a/drivers/video/fbdev/mxsfb.c
++++ b/drivers/video/fbdev/mxsfb.c
+@@ -800,6 +800,7 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host,
+ struct fb_videomode *vmode)
+ {
+ int ret;
++ struct device *dev = &host->pdev->dev;
+ struct fb_info *fb_info = &host->fb_info;
+ struct fb_var_screeninfo *var = &fb_info->var;
+ dma_addr_t fb_phys;
+@@ -825,12 +826,10 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host,
+
+ /* Memory allocation for framebuffer */
+ fb_size = SZ_2M;
+- fb_virt = alloc_pages_exact(fb_size, GFP_DMA);
++ fb_virt = dma_alloc_wc(dev, PAGE_ALIGN(fb_size), &fb_phys, GFP_KERNEL);
+ if (!fb_virt)
+ return -ENOMEM;
+
+- fb_phys = virt_to_phys(fb_virt);
+-
+ fb_info->fix.smem_start = fb_phys;
+ fb_info->screen_base = fb_virt;
+ fb_info->screen_size = fb_info->fix.smem_len = fb_size;
+@@ -843,9 +842,11 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host,
+
+ static void mxsfb_free_videomem(struct mxsfb_info *host)
+ {
++ struct device *dev = &host->pdev->dev;
+ struct fb_info *fb_info = &host->fb_info;
+
+- free_pages_exact(fb_info->screen_base, fb_info->fix.smem_len);
++ dma_free_wc(dev, fb_info->screen_size, fb_info->screen_base,
++ fb_info->fix.smem_start);
+ }
+
+ static const struct platform_device_id mxsfb_devtype[] = {
+--
+2.3.6
+
hooks/post-receive
--
armadeus
|