rcar-gen3: vspmif-module: Correspond boards that do not support Full HD

This commit applies a fix patch to correspond boards that do not support
Full HD.

Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>

2 files changed, 77 insertions, 0 deletions

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
new file mode 100644
index 0000000..9067c6e
--- /dev/null
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/files/0001-rcar_gen3-To-correspond-boards-that-do-not-support-F.patch
@@ -0,0 +1,73 @@
+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 1498a6d..7fa558b 100644
--- a/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc
+++ b/meta-rcar-gen3/recipes-multimedia/vspmif-module/vspmif.inc
@@ -11,5 +11,9 @@ SRCREV = "a2d67ccc2080a5fdc63dd0f31cf7366792c2e113"
 
 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}"