Commit 5ed88f96 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Don't leak the DPT if drm_framebuffer_init() fails 



We are failing to free the already allocated DPT if the final
drm_framebuffer_init() fails. That would require idr_alloc() to
fail, so not very likely, but let's add the cleanup code anyway.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230215222426.26085-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent 46b3c0f6

drivers/gpu/drm/i915/display/intel_fb.c

+4 −1
Original line number Diff line number Diff line
@@ -2017,11 +2017,14 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
	ret = drm_framebuffer_init(&dev_priv->drm, fb, &intel_fb_funcs);

	if (ret) {

		drm_err(&dev_priv->drm, "framebuffer init failed %d\n", ret);

		goto err;

		goto err_free_dpt;

	}



	return 0;



err_free_dpt:

	if (intel_fb_uses_dpt(fb))

		intel_dpt_destroy(intel_fb->dpt_vm);

err:

	intel_frontbuffer_put(intel_fb->frontbuffer);

	return ret;