* [PATCH] drm: rcar-du: Fix build failure
@ 2018-05-15 17:47 Laurent Pinchart
2018-05-16 9:32 ` Kieran Bingham
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2018-05-15 17:47 UTC (permalink / raw)
To: dri-devel; +Cc: Kieran Bingham
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>
---
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 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;
}
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: rcar-du: Fix build failure
2018-05-15 17:47 [PATCH] drm: rcar-du: Fix build failure Laurent Pinchart
@ 2018-05-16 9:32 ` Kieran Bingham
0 siblings, 0 replies; 2+ messages in thread
From: Kieran Bingham @ 2018-05-16 9:32 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 1459 bytes --]
Hi Laurent,
Thanks for the fix.
On 15/05/18 18:47, Laurent Pinchart wrote:
> 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>
The kms-tests work fine on this commit.
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> 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 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;
> }
>
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-16 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-15 17:47 [PATCH] drm: rcar-du: Fix build failure Laurent Pinchart
2018-05-16 9:32 ` Kieran Bingham
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.