[PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha

[Arnd Bergmann]

The "alpha" struct member was removed in one commit but another user
added in another, leading to a build failure:

drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 
'rcar_du_vsp_plane_atomic_duplicate_state':
drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct 
rcar_du_vsp_plane_state' has no member named 'alpha'
  copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha;

This fixes up the merge by using the correct member.

Fixes: 75a07f399cd4 ("drm: rcar-du: Zero-out sg_tables when duplicating plane 
state")
Fixes: 301a9b8d5456 ("drm/rcar-du: Convert to the new generic alpha property")
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +-
 1 file changed, 1 insertion(+), 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 4a98470626d5..d9232e749b6d 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
@@ -322,7 +322,7 @@ 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;
+       copy->state.alpha = plane->state->alpha;
 
        return &copy->state;
 }
-- 
2.9.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel