]> Git Repo - linux.git/commitdiff
drm: rcar-du: Fix build failure
authorLaurent Pinchart <[email protected]>
Tue, 15 May 2018 17:47:52 +0000 (20:47 +0300)
committerDave Airlie <[email protected]>
Thu, 17 May 2018 05:03:40 +0000 (15:03 +1000)
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 <[email protected]>
Reviewed-by: Kieran Bingham <[email protected]>
Tested-by: Kieran Bingham <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/rcar-du/rcar_du_vsp.c

index 27a440886b17b3c07ea9878f1f1e04d116318764..c59f0cfabd33946109d3f3148726786b0f1a011d 100644 (file)
@@ -314,7 +314,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;
 }
This page took 0.05363 seconds and 4 git commands to generate.