* [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value
@ 2023-12-16 14:15 Simon Ser
2023-12-18 11:36 ` Maira Canal
2024-01-02 12:06 ` (subset) " Maxime Ripard
0 siblings, 2 replies; 3+ messages in thread
From: Simon Ser @ 2023-12-16 14:15 UTC (permalink / raw)
To: dri-devel; +Cc: Kees Cook, Maxime Ripard, Dave Stevenson
Bubble up any error to the caller.
Signed-off-by: Simon Ser <contact@emersion.fr>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
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 00e713faecd5..b8184374332c 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -1497,13 +1497,16 @@ static int vc4_prepare_fb(struct drm_plane *plane,
struct drm_plane_state *state)
{
struct vc4_bo *bo;
+ int ret;
if (!state->fb)
return 0;
bo = to_vc4_bo(&drm_fb_dma_get_gem_obj(state->fb, 0)->base);
- drm_gem_plane_helper_prepare_fb(plane, state);
+ ret = drm_gem_plane_helper_prepare_fb(plane, state);
+ if (ret)
+ return ret;
if (plane->state->fb == state->fb)
return 0;
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value
2023-12-16 14:15 [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value Simon Ser
@ 2023-12-18 11:36 ` Maira Canal
2024-01-02 12:06 ` (subset) " Maxime Ripard
1 sibling, 0 replies; 3+ messages in thread
From: Maira Canal @ 2023-12-18 11:36 UTC (permalink / raw)
To: Simon Ser, dri-devel; +Cc: Kees Cook, Maxime Ripard, Dave Stevenson
Hi Simon,
On 12/16/23 11:15, Simon Ser wrote:
> Bubble up any error to the caller.
>
> Signed-off-by: Simon Ser <contact@emersion.fr>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Maíra Canal <mcanal@igalia.com>
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 00e713faecd5..b8184374332c 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -1497,13 +1497,16 @@ static int vc4_prepare_fb(struct drm_plane *plane,
> struct drm_plane_state *state)
> {
> struct vc4_bo *bo;
> + int ret;
>
> if (!state->fb)
> return 0;
>
> bo = to_vc4_bo(&drm_fb_dma_get_gem_obj(state->fb, 0)->base);
>
> - drm_gem_plane_helper_prepare_fb(plane, state);
> + ret = drm_gem_plane_helper_prepare_fb(plane, state);
> + if (ret)
> + return ret;
>
> if (plane->state->fb == state->fb)
> return 0;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: (subset) [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value
2023-12-16 14:15 [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value Simon Ser
2023-12-18 11:36 ` Maira Canal
@ 2024-01-02 12:06 ` Maxime Ripard
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Ripard @ 2024-01-02 12:06 UTC (permalink / raw)
To: dri-devel, Simon Ser; +Cc: Kees Cook, Dave Stevenson
On Sat, 16 Dec 2023 14:15:27 +0000, Simon Ser wrote:
> Bubble up any error to the caller.
>
>
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-02 12:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-16 14:15 [PATCH] drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value Simon Ser
2023-12-18 11:36 ` Maira Canal
2024-01-02 12:06 ` (subset) " Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).