Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/meson: plane: Add error handling

This patch adds robust error handling to the meson_plane_create
function in drivers/gpu/drm/meson/meson_plane.c. The function
previously lacked proper handling for potential failure scenarios
of the drm_universal_plane_init call.

Signed-off-by: Haoran Liu <liuhaoran14@163.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231129113405.33057-1-liuhaoran14@163.com
[narmstrong: fixe the commit subject]
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231129113405.33057-1-liuhaoran14@163.com

authored by

Haoran Liu and committed by
Neil Armstrong
3c28b239 310ec038

+11 -6
+11 -6
drivers/gpu/drm/meson/meson_plane.c
··· 534 534 struct meson_plane *meson_plane; 535 535 struct drm_plane *plane; 536 536 const uint64_t *format_modifiers = format_modifiers_default; 537 + int ret; 537 538 538 539 meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane), 539 540 GFP_KERNEL); ··· 549 548 else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) 550 549 format_modifiers = format_modifiers_afbc_g12a; 551 550 552 - drm_universal_plane_init(priv->drm, plane, 0xFF, 553 - &meson_plane_funcs, 554 - supported_drm_formats, 555 - ARRAY_SIZE(supported_drm_formats), 556 - format_modifiers, 557 - DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane"); 551 + ret = drm_universal_plane_init(priv->drm, plane, 0xFF, 552 + &meson_plane_funcs, 553 + supported_drm_formats, 554 + ARRAY_SIZE(supported_drm_formats), 555 + format_modifiers, 556 + DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane"); 557 + if (ret) { 558 + devm_kfree(priv->drm->dev, meson_plane); 559 + return ret; 560 + } 558 561 559 562 drm_plane_helper_add(plane, &meson_plane_helper_funcs); 560 563