UnifiedHMI: Update SRCREV for RVGPU and virtio-loopback-driver, and upgrade mesa-virtio.

- OSS RVGPU update: Support for xdg_shell.

- OSS virtio-gpu-driver update: Simplify directory structure, not use cmake.

- Recipe updates:

  1, Update SRCREV for RVGPU. Since RVGPU now supports xdg_shell in OSS, the patch enabling xdg_shell has been removed.

  2, Remove the agl-shell-desktop interface because it is planned to be phased out.

  3, Upgrade the base mesa for mesa-virtio from 18.2.0 to 20.3.5. Remove patches that were used with mesa-18.2.0. We are exploring ways to run it with the newer mesa.

  4, Update SRCREV for virtio-loopback-driver.

  5, Update meta-data for patches of RVGPU and virtio-gpu-driver. The content of the patches remains unchanged.

We are planning to support a gRPC protocol interface for RVGPU.

Bug-AGL: SPEC-4898

Change-Id: Ie314f40687c92ef93258b8fdc817584586d20e25
Signed-off-by: Fumiya Kohzu <kohzu.fumiya@jp.panasonic.com>

6 files changed, 31 insertions, 61 deletions

diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc b/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc
index b052dfd1..5d405afd 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc
+++ b/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc
@@ -1,3 +1,5 @@
+DESCRIPTION = "Enable linux virtio-loopback driver"
+
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux-common/:"
 
 SRC_URI:append = " \
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
index 3c21d446..fe0757d4 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
+++ b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
@@ -1,5 +1,5 @@
 PV = "0.0+git${SRCPV}"
-SRCREV = "db18183e68033fd4a6798e8998a5d9a3c6410cfc"
+SRCREV = "070ba544722c78e3f6a0f43e4fe08a0214c66a49"
 BRANCH ?= "main"
 SRC_URI = " \
    git://github.com/unified-hmi/virtio-loopback-driver.git;protocol=https;branch=${BRANCH} \
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/0001-Remove-card_index-option.patch b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/0001-Remove-card_index-option.patch
index e20df709..b3305d3d 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/0001-Remove-card_index-option.patch
+++ b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/0001-Remove-card_index-option.patch
@@ -1,24 +1,21 @@
-From ba9b19b36f7c7f7df8c4041569f7cef04b2d42da Mon Sep 17 00:00:00 2001
-From: murakami <murakami.kenta002@jp.panasonic.jp>
-Date: Fri, 28 Jul 2023 13:05:19 +0900
-Subject: [PATCH] Remove card_index option
-
-Remove card_index option support from virtio-loopback-driver,
-because the kernel needs to be patched to run that option 
-in rvgpu-proxy. 
+From 123a03d7e2ae90da1b8a00ada136f439ba5672db Mon Sep 17 00:00:00 2001
+From: Fumiya Kohzu <kohzu.fumiya@jp.panasonic.com>
+Date: Mon, 20 Nov 2023 19:37:50 +0900
+Subject: [PATCH] Remove card_index option support from virtio-loopback-driver,
+ because the kernel needs to be patched to run that option in rvgpu-proxy.
 
 Upstream-Status: Inappropriate [embedded specific]
 ---
- src/virtio_lo.h        | 1 -
- src/virtio_lo_device.c | 1 -
- src/virtio_lo_device.h | 1 -
- src/virtio_lo_driver.c | 3 ---
+ virtio_lo.h        | 1 -
+ virtio_lo_device.c | 1 -
+ virtio_lo_device.h | 1 -
+ virtio_lo_driver.c | 3 ---
  4 files changed, 6 deletions(-)
 
-diff --git a/src/virtio_lo.h b/src/virtio_lo.h
+diff --git a/virtio_lo.h b/virtio_lo.h
 index a07fa91..0da681e 100644
---- a/src/virtio_lo.h
-+++ b/src/virtio_lo.h
+--- a/virtio_lo.h
++++ b/virtio_lo.h
 @@ -25,7 +25,6 @@ struct virtio_lo_devinfo {
  	__u64 features; /* IN/OUT */
  	__u32 config_size; /* IN */
@@ -27,10 +24,10 @@ index a07fa91..0da681e 100644
  	__u32 padding; /* IN */
  	__u8 *config; /* IN/OUT */
  	struct virtio_lo_qinfo *qinfo; /* IN/OUT */
-diff --git a/src/virtio_lo_device.c b/src/virtio_lo_device.c
+diff --git a/virtio_lo_device.c b/virtio_lo_device.c
 index 39e8788..22687b7 100644
---- a/src/virtio_lo_device.c
-+++ b/src/virtio_lo_device.c
+--- a/virtio_lo_device.c
++++ b/virtio_lo_device.c
 @@ -171,7 +171,6 @@ static long vilo_ioctl_adddev(struct virtio_lo_owner *owner,
  
  	dev->device_id = di.device_id;
@@ -39,10 +36,10 @@ index 39e8788..22687b7 100644
  	dev->nqueues = di.nqueues;
  	dev->features = dev->device_features = di.features;
  
-diff --git a/src/virtio_lo_device.h b/src/virtio_lo_device.h
+diff --git a/virtio_lo_device.h b/virtio_lo_device.h
 index 2d872a7..bc40b3e 100644
---- a/src/virtio_lo_device.h
-+++ b/src/virtio_lo_device.h
+--- a/virtio_lo_device.h
++++ b/virtio_lo_device.h
 @@ -25,7 +25,6 @@ struct virtio_lo_device {
  	unsigned idx;
  	u32 device_id;
@@ -51,10 +48,10 @@ index 2d872a7..bc40b3e 100644
  
  	struct platform_device *pdev;
  
-diff --git a/src/virtio_lo_driver.c b/src/virtio_lo_driver.c
+diff --git a/virtio_lo_driver.c b/virtio_lo_driver.c
 index 30d1852..d7f517d 100644
---- a/src/virtio_lo_driver.c
-+++ b/src/virtio_lo_driver.c
+--- a/virtio_lo_driver.c
++++ b/virtio_lo_driver.c
 @@ -284,9 +284,6 @@ static int virtio_lo_probe(struct platform_device *pdev)
  	vl_driv->device = device;
  	vl_driv->pdev = pdev;
@@ -66,5 +63,5 @@ index 30d1852..d7f517d 100644
  	vl_driv->vdev.dev.release = virtio_lo_release_dev_empty;
  	vl_driv->vdev.config = &virtio_lo_config_ops;
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Kbuild b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Kbuild
deleted file mode 100644
index 27e54e58..00000000
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-# KBuild for virtio-lo
-obj-m += virtio_lo.o
-virtio_lo-y := virtio_lo_device.o virtio_lo_driver.o
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Makefile.driver b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Makefile.driver
deleted file mode 100644
index 662c18ea..00000000
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver/Makefile.driver
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for virtio-lo
-#
-ifeq ($(KDIR),)
-$(error "KDIR must be specified.")
-endif
-
-default:
-	$(MAKE) -C $(KDIR) M=$$PWD/src
-
-modules_install:
-	$(MAKE) -C $(KDIR) M=$$PWD/src $@
-
-clean:
-	$(MAKE) -C $(KDIR) M=$$PWD/src $@
-
-.PHONY: default modules_install clean
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
index 687c33dd..7a203767 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
+++ b/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
@@ -7,24 +7,20 @@ require virtio-loopback-driver.inc
 
 SRC_URI:append = " \
     file://0001-Remove-card_index-option.patch \
-    file://Makefile.driver \
-    file://Kbuild \
 "
 
 S = "${WORKDIR}/git"
-EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_BUILDDIR}"
-MODULES_MODULE_SYMVERS_LOCATION = "src"
 
 inherit module
 
-do_compile:prepend() {
-    cp ${WORKDIR}/Makefile.driver ${S}/Makefile
-    cp ${WORKDIR}/Kbuild ${S}/src/
-}
+EXTRA_OEMAKE = "M=${S} -C ${STAGING_KERNEL_DIR}"
 
 do_install:append() {
-    install -d ${D}${PKG_CONFIG_SYSTEM_INCLUDE_PATH}/remote-virtio-gpu
-    install -m 755 ${S}/src/virtio_lo.h ${D}${PKG_CONFIG_SYSTEM_INCLUDE_PATH}/remote-virtio-gpu/virtio_lo.h
+    install -d ${D}${PKG_CONFIG_SYSTEM_INCLUDE_PATH}/linux
+    install -m 755 ${S}/virtio_lo.h ${D}${PKG_CONFIG_SYSTEM_INCLUDE_PATH}/linux/
+    # Add this section to install virtio_lo.conf
+    install -d ${D}${sysconfdir}/modules-load.d
+    echo "virtio_lo" > ${D}${sysconfdir}/modules-load.d/virtio_lo.conf
 }
 
 FILES:${PN} = " \
@@ -32,10 +28,5 @@ FILES:${PN} = " \
     ${sysconfdir}/modules-load.d \
 "
 
-RPROVIDES:${PN} += " \
-    kernel-module-virtiolo \
-    kernel-module-virtio-lo${KERNEL_MODULE_PACKAGE_SUFFIX} \
-"
-
 # Autoload virtio lo driver
 KERNEL_MODULE_AUTOLOAD:append = " virtio_lo"