diff options
4 files changed, 3 insertions, 80 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb index 1125f23..1f534f8 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb @@ -16,7 +16,7 @@ PR = "r0" VSPM_DRV_URL = "git://github.com/renesas-rcar/vspm_drv.git" BRANCH = "rcar_gen3" -SRCREV = "d58f317d7039f88f2dce5b86d6de0aa7b2b97cbf" +SRCREV = "7f854a9a1c4760255a54b7c14891d1545ed1bf43" SRC_URI = "${VSPM_DRV_URL};branch=${BRANCH}" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb index b060c64..95e71c4 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb @@ -17,7 +17,7 @@ PR = "r0" VSPMIF_DRV_URL = " \ git://github.com/renesas-rcar/vspmif_drv.git" BRANCH = "rcar_gen3" -SRCREV = "0d14c04f8a1dd7946c44e9e1041c62d054a741a5" +SRCREV = "6172cc7273aae0345db894faa5ab59777549c247" SRC_URI = "${VSPMIF_DRV_URL};branch=${BRANCH}" diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/files/0001-rcar_gen3-To-correspond-boards-that-do-not-support-F.patch b/meta-rcar-gen3/recipes-multimedia/vspmif-module/files/0001-rcar_gen3-To-correspond-boards-that-do-not-support-F.patch deleted file mode 100644 index 9067c6e..0000000 --- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/files/0001-rcar_gen3-To-correspond-boards-that-do-not-support-F.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1f4c6a71cb34b9f8ce5b65db290f4526e3ec8333 Mon Sep 17 00:00:00 2001 -From: Sojiro Kusunoki <sojiro.kusunoki.zj@ps.hitachi-solutions.com> -Date: Thu, 18 Oct 2018 17:11:25 +0900 -Subject: [PATCH] rcar_gen3: To correspond boards that do not support Full HD - -Signed-off-by: Sojiro Kusunoki <sojiro.kusunoki.zj@ps.hitachi-solutions.com> -Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com> ---- - vspm_if-tp-user/files/vspm_if/README.txt | 2 +- - vspm_if-tp-user/files/vspm_if/vspm_tp_lossy.c | 27 ++++++++++++++++++++++++--- - 2 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/vspm_if-tp-user/files/vspm_if/README.txt b/vspm_if-tp-user/files/vspm_if/README.txt -index 79c86cb..6269c2b 100644 ---- a/vspm_if-tp-user/files/vspm_if/README.txt -+++ b/vspm_if-tp-user/files/vspm_if/README.txt -@@ -15,7 +15,7 @@ Sample programs for VSP Manager - - # monitor - -- Please connect a HDMI monitor that supports Full HD or higher resolution. -+ Please connect a HDMI monitor. - - - ## Sample programs -diff --git a/vspm_if-tp-user/files/vspm_if/vspm_tp_lossy.c b/vspm_if-tp-user/files/vspm_if/vspm_tp_lossy.c -index 2ce0390..7d49f08 100644 ---- a/vspm_if-tp-user/files/vspm_if/vspm_tp_lossy.c -+++ b/vspm_if-tp-user/files/vspm_if/vspm_tp_lossy.c -@@ -280,8 +280,16 @@ static void output_fb(struct vspm_tp_private_t *priv) - return; - } - -- vinfo.xres = 1920; -- vinfo.yres = 1080; -+ if (vinfo.xres_virtual > 1920) -+ vinfo.xres = 1920; -+ else -+ vinfo.xres = vinfo.xres_virtual; -+ -+ if (vinfo.yres_virtual > 1080) -+ vinfo.yres = 1080; -+ else -+ vinfo.yres = vinfo.yres_virtual; -+ - screensize = vinfo.xres * vinfo.yres * vinfo.bits_per_pixel / 8; - - fbp = (char*)mmap(0, screensize, PROT_READ|PROT_WRITE, MAP_SHARED, fbfd, 0); -@@ -291,7 +299,20 @@ static void output_fb(struct vspm_tp_private_t *priv) - return; - } - -- memcpy(fbp, (unsigned char*)priv->out_virt, screensize); -+ if (vinfo.xres == 1920 && vinfo.yres == 1080) { -+ memcpy(fbp, (unsigned char*)priv->out_virt, screensize); -+ } else { -+ int i; -+ unsigned char *pto, *pfrom; -+ -+ pto = (unsigned char *)fbp; -+ pfrom = (unsigned char *)priv->out_virt; -+ for (i = 0; i < vinfo.yres; i++) { -+ memcpy(pto, pfrom, vinfo.xres * vinfo.bits_per_pixel / 8); -+ pto += (vinfo.xres * vinfo.bits_per_pixel / 8); -+ pfrom += (1920 * 4); -+ } -+ } - - ercd = ioctl(fbfd, FBIOPAN_DISPLAY, &vinfo); - if (ercd) { --- -1.9.1 - diff --git a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc index 7fa558b..34e8587 100644 --- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc +++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc @@ -7,13 +7,9 @@ require include/rcar-gen3-modules-common.inc VSPMIF_LIB_URL = "git://github.com/renesas-rcar/vspmif_lib.git" BRANCH = "rcar_gen3" -SRCREV = "a2d67ccc2080a5fdc63dd0f31cf7366792c2e113" +SRCREV = "06fe8b1341801079f8a2b964ea95980967dcf789" SRC_URI = "${VSPMIF_LIB_URL};branch=${BRANCH}" -SRC_URI_append = " \ - file://0001-rcar_gen3-To-correspond-boards-that-do-not-support-F.patch \ -" - # This module is machine specific. PACKAGE_ARCH = "${MACHINE_ARCH}" |