diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2018-05-15 20:47:52 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-17 08:03:40 +0300 |
| commit | 315852b422972e6ebb1dfddaadada09e46a2681a (patch) | |
| tree | 69770e68de2968124f26cf117a8f4d4a28f4b4be | |
| parent | dd856d924b2471bf28e7c60df881529525a1192c (diff) | |
| download | linux-315852b422972e6ebb1dfddaadada09e46a2681a.tar.xz | |
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 <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180515174752.28954-1-laurent.pinchart+renesas@ideasonboard.com
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 27a440886b17..c59f0cfabd33 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -314,7 +314,6 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, ©->state); - copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; return ©->state; } |