* [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset
@ 2024-12-02 12:03 Stefan Wahren
2024-12-02 12:17 ` Maxime Ripard
2024-12-11 13:19 ` Maíra Canal
0 siblings, 2 replies; 5+ messages in thread
From: Stefan Wahren @ 2024-12-02 12:03 UTC (permalink / raw)
To: Maxime Ripard, Dave Stevenson, Maíra Canal
Cc: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
kernel-list, dri-devel, Stefan Wahren
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
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>
---
drivers/gpu/drm/vc4/vc4_plane.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index ba6e86d62a77..1aaa4938824b 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -330,7 +330,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)
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset
2024-12-02 12:03 [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset Stefan Wahren
@ 2024-12-02 12:17 ` Maxime Ripard
2024-12-11 13:19 ` Maíra Canal
1 sibling, 0 replies; 5+ messages in thread
From: Maxime Ripard @ 2024-12-02 12:17 UTC (permalink / raw)
To: Stefan Wahren
Cc: dri-devel, kernel-list, Dave Stevenson, David Airlie,
Maarten Lankhorst, Maxime Ripard, Maíra Canal, Simona Vetter,
Thomas Zimmermann
On Mon, 2 Dec 2024 13:03:43 +0100, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> 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.
>
>
> [ ... ]
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Thanks!
Maxime
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset
2024-12-02 12:03 [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset Stefan Wahren
2024-12-02 12:17 ` Maxime Ripard
@ 2024-12-11 13:19 ` Maíra Canal
2024-12-11 14:07 ` Stefan Wahren
1 sibling, 1 reply; 5+ messages in thread
From: Maíra Canal @ 2024-12-11 13:19 UTC (permalink / raw)
To: Stefan Wahren, Maxime Ripard, Dave Stevenson
Cc: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
kernel-list, dri-devel
Hi Stefan,
On 02/12/24 09:03, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> 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>
Was this patch applied? Let me know if you would like it to be applied
to drm-misc-next.
Best Regards,
- Maíra
> ---
> drivers/gpu/drm/vc4/vc4_plane.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index ba6e86d62a77..1aaa4938824b 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -330,7 +330,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)
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset
2024-12-11 13:19 ` Maíra Canal
@ 2024-12-11 14:07 ` Stefan Wahren
2024-12-11 14:51 ` Maíra Canal
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Wahren @ 2024-12-11 14:07 UTC (permalink / raw)
To: Maíra Canal, Maxime Ripard, Dave Stevenson
Cc: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
kernel-list, dri-devel
Hi Maíra,
Am 11.12.24 um 14:19 schrieb Maíra Canal:
> Hi Stefan,
>
> On 02/12/24 09:03, Stefan Wahren wrote:
>> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>>
>> 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>
>
> Was this patch applied?
No, but Maxime send his RB.
> Let me know if you would like it to be applied
> to drm-misc-next.
Yes, please.
Best regards
>
> Best Regards,
> - Maíra
>
>> ---
>> drivers/gpu/drm/vc4/vc4_plane.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c
>> b/drivers/gpu/drm/vc4/vc4_plane.c
>> index ba6e86d62a77..1aaa4938824b 100644
>> --- a/drivers/gpu/drm/vc4/vc4_plane.c
>> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
>> @@ -330,7 +330,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)
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset
2024-12-11 14:07 ` Stefan Wahren
@ 2024-12-11 14:51 ` Maíra Canal
0 siblings, 0 replies; 5+ messages in thread
From: Maíra Canal @ 2024-12-11 14:51 UTC (permalink / raw)
To: Stefan Wahren, Maxime Ripard, Dave Stevenson
Cc: Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
kernel-list, dri-devel
Hi Stefan,
On 11/12/24 11:07, Stefan Wahren wrote:
> Hi Maíra,
>
> Am 11.12.24 um 14:19 schrieb Maíra Canal:
>> Hi Stefan,
>>
>> On 02/12/24 09:03, Stefan Wahren wrote:
>>> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>>>
>>> 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>
>>
>> Was this patch applied?
> No, but Maxime send his RB.
>> Let me know if you would like it to be applied
>> to drm-misc-next.
> Yes, please.
Applied to misc/kernel.git (drm-misc-next) [1].
[1]
https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/c5cf801914ef3e67923e5dc912e04167e665dd11
Best Regards,
- Maíra
>
> Best regards
>>
>> Best Regards,
>> - Maíra
>>
>>> ---
>>> drivers/gpu/drm/vc4/vc4_plane.c | 5 ++++-
>>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c
>>> b/drivers/gpu/drm/vc4/vc4_plane.c
>>> index ba6e86d62a77..1aaa4938824b 100644
>>> --- a/drivers/gpu/drm/vc4/vc4_plane.c
>>> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
>>> @@ -330,7 +330,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)
>>> --
>>> 2.34.1
>>>
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-11 14:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-02 12:03 [PATCH] drm/vc4: plane: Remove WARN on state being set in plane_reset Stefan Wahren
2024-12-02 12:17 ` Maxime Ripard
2024-12-11 13:19 ` Maíra Canal
2024-12-11 14:07 ` Stefan Wahren
2024-12-11 14:51 ` Maíra Canal
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.