Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 315852b4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Dave Airlie
Browse files

drm: rcar-du: Fix build failure 



Commit 75a07f39 ("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 301a9b8d
("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: 75a07f39 ("drm: rcar-du: Zero-out sg_tables when duplicating plane state")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Tested-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180515174752.28954-1-laurent.pinchart+renesas@ideasonboard.com
parent dd856d92

drivers/gpu/drm/rcar-du/rcar_du_vsp.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}