Merge branch 'drm/du/next' of git://linuxtv.org/pinchartl/media into drm-next

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2792436.F0zlxykWp6@avalon

10 files changed, 104 insertions, 50 deletions

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index c4420538ec85..f2a0bd1e5119 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -767,7 +767,8 @@ static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
  * Initialization
  */
 
-int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
+int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex,
+                        unsigned int hwindex)
 {
         static const unsigned int mmio_offsets[] = {
                 DU0_REG_OFFSET, DU1_REG_OFFSET, DU2_REG_OFFSET, DU3_REG_OFFSET
@@ -775,7 +776,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 
         struct rcar_du_device *rcdu = rgrp->dev;
         struct platform_device *pdev = to_platform_device(rcdu->dev);
-        struct rcar_du_crtc *rcrtc = &rcdu->crtcs[index];
+        struct rcar_du_crtc *rcrtc = &rcdu->crtcs[swindex];
         struct drm_crtc *crtc = &rcrtc->crtc;
         struct drm_plane *primary;
         unsigned int irqflags;
@@ -787,7 +788,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 
         /* Get the CRTC clock and the optional external clock. */
         if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) {
-                sprintf(clk_name, "du.%u", index);
+                sprintf(clk_name, "du.%u", hwindex);
                 name = clk_name;
         } else {
                 name = NULL;
@@ -795,16 +796,16 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 
         rcrtc->clock = devm_clk_get(rcdu->dev, name);
         if (IS_ERR(rcrtc->clock)) {
-                dev_err(rcdu->dev, "no clock for CRTC %u\n", index);
+                dev_err(rcdu->dev, "no clock for DU channel %u\n", hwindex);
                 return PTR_ERR(rcrtc->clock);
         }
 
-        sprintf(clk_name, "dclkin.%u", index);
+        sprintf(clk_name, "dclkin.%u", hwindex);
         clk = devm_clk_get(rcdu->dev, clk_name);
         if (!IS_ERR(clk)) {
                 rcrtc->extclock = clk;
         } else if (PTR_ERR(rcrtc->clock) == -EPROBE_DEFER) {
-                dev_info(rcdu->dev, "can't get external clock %u\n", index);
+                dev_info(rcdu->dev, "can't get external clock %u\n", hwindex);
                 return -EPROBE_DEFER;
         }
 
@@ -813,13 +814,13 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
         spin_lock_init(&rcrtc->vblank_lock);
 
         rcrtc->group = rgrp;
-        rcrtc->mmio_offset = mmio_offsets[index];
-        rcrtc->index = index;
+        rcrtc->mmio_offset = mmio_offsets[hwindex];
+        rcrtc->index = hwindex;
 
         if (rcar_du_has(rcdu, RCAR_DU_FEATURE_VSP1_SOURCE))
                 primary = &rcrtc->vsp->planes[rcrtc->vsp_pipe].plane;
         else
-                primary = &rgrp->planes[index % 2].plane;
+                primary = &rgrp->planes[swindex % 2].plane;
 
         ret = drm_crtc_init_with_planes(rcdu->ddev, crtc, primary,
                                         NULL, &crtc_funcs, NULL);
@@ -833,7 +834,8 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 
         /* Register the interrupt handler. */
         if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) {
-                irq = platform_get_irq(pdev, index);
+                /* The IRQ's are associated with the CRTC (sw)index. */
+                irq = platform_get_irq(pdev, swindex);
                 irqflags = 0;
         } else {
                 irq = platform_get_irq(pdev, 0);
@@ -841,7 +843,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
         }
 
         if (irq < 0) {
-                dev_err(rcdu->dev, "no IRQ for CRTC %u\n", index);
+                dev_err(rcdu->dev, "no IRQ for CRTC %u\n", swindex);
                 return irq;
         }
 
@@ -849,7 +851,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
                                dev_name(rcdu->dev), rcrtc);
         if (ret < 0) {
                 dev_err(rcdu->dev,
-                        "failed to register IRQ for CRTC %u\n", index);
+                        "failed to register IRQ for CRTC %u\n", swindex);
                 return ret;
         }
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
index fdc2bf99bda1..84b5e23a85b1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
@@ -80,7 +80,8 @@ enum rcar_du_output {
         RCAR_DU_OUTPUT_MAX,
 };
 
-int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index);
+int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex,
+                        unsigned int hwindex);
 void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc);
 void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc);
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 3917d839c04c..02aee6cb0e53 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -40,7 +40,7 @@ static const struct rcar_du_device_info rzg1_du_r8a7743_info = {
         .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7743 has one RGB output and one LVDS output
@@ -61,7 +61,7 @@ static const struct rcar_du_device_info rzg1_du_r8a7745_info = {
         .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7745 has two RGB outputs
@@ -80,7 +80,7 @@ static const struct rcar_du_device_info rzg1_du_r8a7745_info = {
 static const struct rcar_du_device_info rcar_du_r8a7779_info = {
         .gen = 2,
         .features = 0,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7779 has two RGB outputs and one (currently unsupported)
@@ -102,7 +102,7 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = {
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
         .quirks = RCAR_DU_QUIRK_ALIGN_128B,
-        .num_crtcs = 3,
+        .channels_mask = BIT(2) | BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7790 has one RGB output, two LVDS outputs and one
@@ -129,7 +129,7 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = {
         .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A779[13] has one RGB output, one LVDS output and one
@@ -151,7 +151,7 @@ static const struct rcar_du_device_info rcar_du_r8a7792_info = {
         .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /* R8A7792 has two RGB outputs. */
                 [RCAR_DU_OUTPUT_DPAD0] = {
@@ -169,7 +169,7 @@ static const struct rcar_du_device_info rcar_du_r8a7794_info = {
         .gen = 2,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS,
-        .num_crtcs = 2,
+        .channels_mask = BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7794 has two RGB outputs and one (currently unsupported)
@@ -191,7 +191,7 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = {
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS
                   | RCAR_DU_FEATURE_VSP1_SOURCE,
-        .num_crtcs = 4,
+        .channels_mask = BIT(3) | BIT(2) | BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7795 has one RGB output, two HDMI outputs and one
@@ -215,7 +215,7 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = {
                 },
         },
         .num_lvds = 1,
-        .dpll_ch =  BIT(1) | BIT(2),
+        .dpll_ch =  BIT(2) | BIT(1),
 };
 
 static const struct rcar_du_device_info rcar_du_r8a7796_info = {
@@ -223,7 +223,7 @@ static const struct rcar_du_device_info rcar_du_r8a7796_info = {
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS
                   | RCAR_DU_FEATURE_VSP1_SOURCE,
-        .num_crtcs = 3,
+        .channels_mask = BIT(2) | BIT(1) | BIT(0),
         .routes = {
                 /*
                  * R8A7796 has one RGB output, one LVDS output and one HDMI
@@ -246,12 +246,40 @@ static const struct rcar_du_device_info rcar_du_r8a7796_info = {
         .dpll_ch =  BIT(1),
 };
 
+static const struct rcar_du_device_info rcar_du_r8a77965_info = {
+        .gen = 3,
+        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
+                  | RCAR_DU_FEATURE_EXT_CTRL_REGS
+                  | RCAR_DU_FEATURE_VSP1_SOURCE,
+        .channels_mask = BIT(3) | BIT(1) | BIT(0),
+        .routes = {
+                /*
+                 * R8A77965 has one RGB output, one LVDS output and one HDMI
+                 * output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(2),
+                        .port = 0,
+                },
+                [RCAR_DU_OUTPUT_HDMI0] = {
+                        .possible_crtcs = BIT(1),
+                        .port = 1,
+                },
+                [RCAR_DU_OUTPUT_LVDS0] = {
+                        .possible_crtcs = BIT(0),
+                        .port = 2,
+                },
+        },
+        .num_lvds = 1,
+        .dpll_ch =  BIT(1),
+};
+
 static const struct rcar_du_device_info rcar_du_r8a77970_info = {
         .gen = 3,
         .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
                   | RCAR_DU_FEATURE_EXT_CTRL_REGS
                   | RCAR_DU_FEATURE_VSP1_SOURCE,
-        .num_crtcs = 1,
+        .channels_mask = BIT(0),
         .routes = {
                 /* R8A77970 has one RGB output and one LVDS output. */
                 [RCAR_DU_OUTPUT_DPAD0] = {
@@ -277,6 +305,7 @@ static const struct of_device_id rcar_du_of_table[] = {
         { .compatible = "renesas,du-r8a7794", .data = &rcar_du_r8a7794_info },
         { .compatible = "renesas,du-r8a7795", .data = &rcar_du_r8a7795_info },
         { .compatible = "renesas,du-r8a7796", .data = &rcar_du_r8a7796_info },
+        { .compatible = "renesas,du-r8a77965", .data = &rcar_du_r8a77965_info },
         { .compatible = "renesas,du-r8a77970", .data = &rcar_du_r8a77970_info },
         { }
 };
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index 131d8e88b06c..b3a25e8e07d0 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -52,7 +52,7 @@ struct rcar_du_output_routing {
  * @gen: device generation (2 or 3)
  * @features: device features (RCAR_DU_FEATURE_*)
  * @quirks: device quirks (RCAR_DU_QUIRK_*)
- * @num_crtcs: total number of CRTCs
+ * @channels_mask: bit mask of available DU channels
  * @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*)
  * @num_lvds: number of internal LVDS encoders
  */
@@ -60,7 +60,7 @@ struct rcar_du_device_info {
         unsigned int gen;
         unsigned int features;
         unsigned int quirks;
-        unsigned int num_crtcs;
+        unsigned int channels_mask;
         struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX];
         unsigned int num_lvds;
         unsigned int dpll_ch;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c
index 2f37ea901873..d539cb290a35 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_group.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c
@@ -46,10 +46,13 @@ void rcar_du_group_write(struct rcar_du_group *rgrp, u32 reg, u32 data)
 
 static void rcar_du_group_setup_pins(struct rcar_du_group *rgrp)
 {
-        u32 defr6 = DEFR6_CODE | DEFR6_ODPM12_DISP;
+        u32 defr6 = DEFR6_CODE;
 
-        if (rgrp->num_crtcs > 1)
-                defr6 |= DEFR6_ODPM22_DISP;
+        if (rgrp->channels_mask & BIT(0))
+                defr6 |= DEFR6_ODPM02_DISP;
+
+        if (rgrp->channels_mask & BIT(1))
+                defr6 |= DEFR6_ODPM12_DISP;
 
         rcar_du_group_write(rgrp, DEFR6, defr6);
 }
@@ -80,10 +83,11 @@ static void rcar_du_group_setup_defr8(struct rcar_du_group *rgrp)
                  * On Gen3 VSPD routing can't be configured, but DPAD routing
                  * needs to be set despite having a single option available.
                  */
-                u32 crtc = ffs(possible_crtcs) - 1;
+                unsigned int rgb_crtc = ffs(possible_crtcs) - 1;
+                struct rcar_du_crtc *crtc = &rcdu->crtcs[rgb_crtc];
 
-                if (crtc / 2 == rgrp->index)
-                        defr8 |= DEFR8_DRGBS_DU(crtc);
+                if (crtc->index / 2 == rgrp->index)
+                        defr8 |= DEFR8_DRGBS_DU(crtc->index);
         }
 
         rcar_du_group_write(rgrp, DEFR8, defr8);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h
index 5e3adc6b31b5..42105aedecc8 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_group.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h
@@ -25,6 +25,7 @@ struct rcar_du_device;
  * @dev: the DU device
  * @mmio_offset: registers offset in the device memory map
  * @index: group index
+ * @channels_mask: bitmask of populated DU channels in this group
  * @num_crtcs: number of CRTCs in this group (1 or 2)
  * @use_count: number of users of the group (rcar_du_group_(get|put))
  * @used_crtcs: number of CRTCs currently in use
@@ -39,6 +40,7 @@ struct rcar_du_group {
         unsigned int mmio_offset;
         unsigned int index;
 
+        unsigned int channels_mask;
         unsigned int num_crtcs;
         unsigned int use_count;
         unsigned int used_crtcs;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index f4ac0f884f00..f0bc7cc0e913 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -428,7 +428,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
         struct {
                 struct device_node *np;
                 unsigned int crtcs_mask;
-        } vsps[RCAR_DU_MAX_VSPS] = { { 0, }, };
+        } vsps[RCAR_DU_MAX_VSPS] = { { NULL, }, };
         unsigned int vsps_count = 0;
         unsigned int cells;
         unsigned int i;
@@ -507,6 +507,8 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
         struct drm_fbdev_cma *fbdev;
         unsigned int num_encoders;
         unsigned int num_groups;
+        unsigned int swindex;
+        unsigned int hwindex;
         unsigned int i;
         int ret;
 
@@ -520,7 +522,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
         dev->mode_config.funcs = &rcar_du_mode_config_funcs;
         dev->mode_config.helper_private = &rcar_du_mode_config_helper;
 
-        rcdu->num_crtcs = rcdu->info->num_crtcs;
+        rcdu->num_crtcs = hweight8(rcdu->info->channels_mask);
 
         ret = rcar_du_properties_init(rcdu);
         if (ret < 0)
@@ -530,7 +532,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
          * Initialize vertical blanking interrupts handling. Start with vblank
          * disabled for all CRTCs.
          */
-        ret = drm_vblank_init(dev, (1 << rcdu->info->num_crtcs) - 1);
+        ret = drm_vblank_init(dev, (1 << rcdu->num_crtcs) - 1);
         if (ret < 0)
                 return ret;
 
@@ -545,7 +547,10 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
                 rgrp->dev = rcdu;
                 rgrp->mmio_offset = mmio_offsets[i];
                 rgrp->index = i;
-                rgrp->num_crtcs = min(rcdu->num_crtcs - 2 * i, 2U);
+                /* Extract the channel mask for this group only. */
+                rgrp->channels_mask = (rcdu->info->channels_mask >> (2 * i))
+                                   & GENMASK(1, 0);
+                rgrp->num_crtcs = hweight8(rgrp->channels_mask);
 
                 /*
                  * If we have more than one CRTCs in this group pre-associate
@@ -572,10 +577,16 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
         }
 
         /* Create the CRTCs. */
-        for (i = 0; i < rcdu->num_crtcs; ++i) {
-                struct rcar_du_group *rgrp = &rcdu->groups[i / 2];
+        for (swindex = 0, hwindex = 0; swindex < rcdu->num_crtcs; ++hwindex) {
+                struct rcar_du_group *rgrp;
+
+                /* Skip unpopulated DU channels. */
+                if (!(rcdu->info->channels_mask & BIT(hwindex)))
+                        continue;
+
+                rgrp = &rcdu->groups[hwindex / 2];
 
-                ret = rcar_du_crtc_create(rgrp, i);
+                ret = rcar_du_crtc_create(rgrp, swindex++, hwindex);
                 if (ret < 0)
                         return ret;
         }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of.c b/drivers/gpu/drm/rcar-du/rcar_du_of.c
index 68a0b82cb17e..afef69669bb4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_of.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
@@ -18,6 +18,7 @@
 
 #include "rcar_du_crtc.h"
 #include "rcar_du_drv.h"
+#include "rcar_du_of.h"
 
 /* -----------------------------------------------------------------------------
  * Generic Overlay Handling
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
index d5bae99d3cfe..9dfd220ceda1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -187,14 +187,14 @@
 
 #define DEFR6                   0x000e8
 #define DEFR6_CODE              (0x7778 << 16)
-#define DEFR6_ODPM22_DSMR       (0 << 10)
-#define DEFR6_ODPM22_DISP       (2 << 10)
-#define DEFR6_ODPM22_CDE        (3 << 10)
-#define DEFR6_ODPM22_MASK       (3 << 10)
-#define DEFR6_ODPM12_DSMR       (0 << 8)
-#define DEFR6_ODPM12_DISP       (2 << 8)
-#define DEFR6_ODPM12_CDE        (3 << 8)
-#define DEFR6_ODPM12_MASK       (3 << 8)
+#define DEFR6_ODPM12_DSMR       (0 << 10)
+#define DEFR6_ODPM12_DISP       (2 << 10)
+#define DEFR6_ODPM12_CDE        (3 << 10)
+#define DEFR6_ODPM12_MASK       (3 << 10)
+#define DEFR6_ODPM02_DSMR       (0 << 8)
+#define DEFR6_ODPM02_DISP       (2 << 8)
+#define DEFR6_ODPM02_CDE        (3 << 8)
+#define DEFR6_ODPM02_MASK       (3 << 8)
 #define DEFR6_TCNE1             (1 << 6)
 #define DEFR6_TCNE0             (1 << 4)
 #define DEFR6_MLOS1             (1 << 2)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index b3bec0125696..27a440886b17 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -17,6 +17,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>
 
 #include <linux/bitops.h>
@@ -237,6 +238,10 @@ static int rcar_du_vsp_plane_prepare_fb(struct drm_plane *plane,
                 }
         }
 
+        ret = drm_gem_fb_prepare_fb(plane, state);
+        if (ret)
+                goto fail;
+
         return 0;
 
 fail:
@@ -299,18 +304,17 @@ static const struct drm_plane_helper_funcs rcar_du_vsp_plane_helper_funcs = {
 static struct drm_plane_state *
 rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
 {
-        struct rcar_du_vsp_plane_state *state;
         struct rcar_du_vsp_plane_state *copy;
 
         if (WARN_ON(!plane->state))
                 return NULL;
 
-        state = to_rcar_vsp_plane_state(plane->state);
-        copy = kmemdup(state, sizeof(*state), GFP_KERNEL);
+        copy = kzalloc(sizeof(*copy), GFP_KERNEL);
         if (copy == NULL)
                 return NULL;
 
         __drm_atomic_helper_plane_duplicate_state(plane, &copy->state);
+        copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;
 
         return &copy->state;
 }