Commit 3c28b239 authored by Haoran Liu's avatar Haoran Liu Committed by Neil Armstrong
Browse files

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: default avatarHaoran Liu <liuhaoran14@163.com>
Reviewed-by: default avatarNeil 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: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231129113405.33057-1-liuhaoran14@163.com
parent 310ec038

drivers/gpu/drm/meson/meson_plane.c

+11 −6
Original line number Diff line number Diff line
@@ -534,6 +534,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);
@@ -548,12 +549,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,

	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);