drm/meson: plane: Add error handling

[ Upstream commit 3c28b239620e249b68beeca17f429e317fa6b8d4 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 255c6b863f8d2cdebe514ec4d85c86f6c85f92ec..6d54c565b34fab0a746403002a2298ba9a415992 100644 (file)
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -529,6 +529,7 @@ int meson_plane_create(struct meson_drm *priv)
        struct meson_plane *meson_plane;
        struct drm_plane *plane;
        const uint64_t *format_modifiers = format_modifiers_default;
+       int ret;
 
        meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane),
                                   GFP_KERNEL);
@@ -543,12 +544,16 @@ int meson_plane_create(struct meson_drm *priv)
        else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
                format_modifiers = format_modifiers_afbc_g12a;
 
-       drm_universal_plane_init(priv->drm, plane, 0xFF,
-                                &meson_plane_funcs,
-                                supported_drm_formats,
-                                ARRAY_SIZE(supported_drm_formats),
-                                format_modifiers,
-                                DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane");
+       ret = drm_universal_plane_init(priv->drm, plane, 0xFF,
+                                       &meson_plane_funcs,
+                                       supported_drm_formats,
+                                       ARRAY_SIZE(supported_drm_formats),
+                                       format_modifiers,
+                                       DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane");
+       if (ret) {
+               devm_kfree(priv->drm->dev, meson_plane);
+               return ret;
+       }
 
        drm_plane_helper_add(plane, &meson_plane_helper_funcs);