Merge drm/drm-next into drm-misc-next

[linux-block.git] / drivers / gpu / drm / vc4 / vc4_plane.c

diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index cfb50fedfa2b3a49bd37198f093eff841ecd3603..cf78f74bb87f4670efd78be4cf439a0543e59f3c 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -200,9 +200,7 @@ static void vc4_plane_reset(struct drm_plane *plane)
        if (!vc4_state)
                return;
 
-       plane->state = &vc4_state->base;
-       plane->state->alpha = DRM_BLEND_ALPHA_OPAQUE;
-       vc4_state->base.plane = plane;
+       __drm_atomic_helper_plane_reset(plane, &vc4_state->base);
 }
 
 static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val)