Update render node patch to fix build error in BSP 5.9

After BSP 5.9 is merged, linux-renesus fail building in drm-lease environment.
It causes bsp kernel change at
https://github.com/renesas-rcar/linux-bsp/commit/cd7ad23ceb3cbe67263ded2621dda08b4583b0f4

This patch update old patch to fix this build issue.

AGL-Bug : SPEC-4269

Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: Iea8f37c9dbd766a971693a637cd4d90b35d4eef0
(cherry picked from commit 0f364fe8fcd181ba8f2a5e032b21e2fcc3c516ca)

diff --git a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-enable-rcar-du-render-node.patch
similarity index 70%
rename from meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch
rename to meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-enable-rcar-du-render-node.patch
index 5d0052c..0d20c06 100644 (file)
--- a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-support-render-node.patch
+++ b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/files/0002-drm-rcar-du-enable-rcar-du-render-node.patch
@@ -1,4 +1,4 @@
-From 2ea386a6175c695d81365acd3b22a3bc87ab8195 Mon Sep 17 00:00:00 2001
+From 8864d17169297580fb1135719dbf44a8ff4771d5 Mon Sep 17 00:00:00 2001
 From: Tomohito Esaki <etom@igel.co.jp>
 Date: Wed, 8 Aug 2018 14:20:46 +0900
 Subject: [PATCH 2/2] drm: rcar-du: enable rcar-du render node
@@ -7,26 +7,28 @@ Create a render node tied to the DU device so that the allocated
 buffers can be used for scanout, VSP composition, etc.
 
 [dhobsong@igel.co.jp: Rebased to Linux 5.4]
-Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> 
+Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
 
+[Fix for Resolve conflicts for BSP5.9 update]
+Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
 ---
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-index 6a099b04a161..3e63911e4198 100644
+index 7389bbbad896..49272b9ec677 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-@@ -458,7 +458,8 @@ static const struct drm_ioctl_desc rcar_du_ioctls[] = {
+@@ -549,7 +549,8 @@ static const struct drm_ioctl_desc rcar_du_ioctls[] = {
  DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);
  
  static struct drm_driver rcar_du_driver = {
 -      .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
 +      .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC
 +                              | DRIVER_RENDER,
-       DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(rcar_du_dumb_create),
        .fops                   = &rcar_du_fops,
        .name                   = "rcar-du",
+       .desc                   = "Renesas R-Car Display Unit",
 -- 
 2.25.1
 

diff --git a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
index 4e48edf..0306a4c 100644 (file)
--- a/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
+++ b/meta-agl-drm-lease/dynamic-layers/meta-rcar-gen3/recipes-kernel/linux-renesas/linux-renesas_%.bbappend
@@ -3,6 +3,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI:append = " \
     file://0001-drm-enable-dumb-buffer-ops-for-render-nodes.patch \
-    file://0002-drm-rcar-du-support-render-node.patch \
+    file://0002-drm-rcar-du-enable-rcar-du-render-node.patch \
 "