| Message ID | 20231216141518.242811-1-contact@emersion.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: plane: check drm_gem_plane_helper_prepare_fb() return value | expand |
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;
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
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;
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(-)