blob: 7ede2700ce8546609260856c257e74e99b44dfee [file] [log] [blame]
From 3e6ae2773f78d3d08f136c2f58dad615775d4838 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <>
Date: Tue, 15 May 2018 20:47:52 +0300
Subject: [PATCH 1338/1795] drm: rcar-du: Fix build failure
Commit 75a07f399cd4 ("drm: rcar-du: Zero-out sg_tables when duplicating
plane state") introduced a reference to the alpha field of struct
rcar_du_vsp_plane_state that got removed in commit 301a9b8d5456
("drm/rcar-du: Convert to the new generic alpha property"). The issue
stems from the merge of the two commits through separate branches and
breaks compilation of the driver. Fix it.
Fixes: 75a07f399cd4 ("drm: rcar-du: Zero-out sg_tables when duplicating plane state")
Signed-off-by: Laurent Pinchart <>
Reviewed-by: Kieran Bingham <>
Tested-by: Kieran Bingham <>
Signed-off-by: Dave Airlie <>
(cherry picked from commit 315852b422972e6ebb1dfddaadada09e46a2681a)
Signed-off-by: Simon Horman <>
Signed-off-by: Geert Uytterhoeven <>
drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
index ae95e2010a5e..21cbe741d0b4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -316,7 +316,6 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
return NULL;
__drm_atomic_helper_plane_duplicate_state(plane, &copy->state);
- copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;
return &copy->state;