diff options
| author | Dave Stevenson <dave.stevenson@raspberrypi.com> | 2024-12-02 13:03:43 +0100 |
|---|---|---|
| committer | Maíra Canal <mcanal@igalia.com> | 2024-12-11 11:37:39 -0300 |
| commit | c5cf801914ef3e67923e5dc912e04167e665dd11 (patch) | |
| tree | 83d4e047a6e47e592e35111fe5834ac57a4a3891 | |
| parent | 4ee06e3b6120a77fd3967c2c62268083d26c5500 (diff) | |
drm/vc4: plane: Remove WARN on state being set in plane_reset
It is permitted on situations such as system resume for plane->state
to be non-NULL, and that should be handled by freeing it. Do so.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Maíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241202120343.33726-1-wahrenst@gmx.net
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 94737c587f20..d608860d525f 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -368,7 +368,10 @@ static void vc4_plane_reset(struct drm_plane *plane) { struct vc4_plane_state *vc4_state; - WARN_ON(plane->state); + if (plane->state) + __drm_atomic_helper_plane_destroy_state(plane->state); + + kfree(plane->state); vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL); if (!vc4_state) |