Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aec9e129 authored by Archit Taneja's avatar Archit Taneja Committed by Dave Airlie
Browse files

drm/mgag200: Fix error handling paths in fbdev driver 

Set up error handling in mgag200_fbdev_init and mgag200fb_create such that
they release the things they allocate, rather than relying on someone
calling mga_fbdev_destroy.

Based on a patch by Sudip Mukherjee <sudipm.mukherjee@gmail.com>

Link: http://lkml.kernel.org/r/55F6E68D.8070800@codeaurora.org


Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 69e5d3f8

drivers/gpu/drm/mgag200/mgag200_fb.c

+23 −8
Original line number Diff line number Diff line
@@ -186,17 +186,19 @@ static int mgag200fb_create(struct drm_fb_helper *helper, 


	sysram = vmalloc(size);

	if (!sysram)

		return -ENOMEM;

		goto err_sysram;



	info = drm_fb_helper_alloc_fbi(helper);

	if (IS_ERR(info))

		return PTR_ERR(info);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto err_alloc_fbi;

	}



	info->par = mfbdev;



	ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj);

	if (ret)

		return ret;

		goto err_framebuffer_init;



	mfbdev->sysram = sysram;

	mfbdev->size = size;
@@ -225,7 +227,17 @@ static int mgag200fb_create(struct drm_fb_helper *helper, 


	DRM_DEBUG_KMS("allocated %dx%d\n",

		      fb->width, fb->height);



	return 0;



err_framebuffer_init:

	drm_fb_helper_release_fbi(helper);

err_alloc_fbi:

	vfree(sysram);

err_sysram:

	drm_gem_object_unreference_unlocked(gobj);



	return ret;

}



static int mga_fbdev_destroy(struct drm_device *dev,
@@ -276,23 +288,26 @@ int mgag200_fbdev_init(struct mga_device *mdev) 
	ret = drm_fb_helper_init(mdev->dev, &mfbdev->helper,

				 mdev->num_crtc, MGAG200FB_CONN_LIMIT);

	if (ret)

		return ret;

		goto err_fb_helper;



	ret = drm_fb_helper_single_add_all_connectors(&mfbdev->helper);

	if (ret)

		goto fini;

		goto err_fb_setup;



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(mdev->dev);



	ret = drm_fb_helper_initial_config(&mfbdev->helper, bpp_sel);

	if (ret)

		goto fini;

		goto err_fb_setup;



	return 0;



fini:

err_fb_setup:

	drm_fb_helper_fini(&mfbdev->helper);

err_fb_helper:

	mdev->mfbdev = NULL;



	return ret;

}