[PATCH] drm/mgag200: Fix calling drm_fb_helper_fini() twice

Ingo Molnar
2015-09-16T09:47:00Z

* Archit Taneja <architt@codeaurora.org> wrote:

> From: Archit Taneja <architt@codeaurora.org>
> Date: Mon, 14 Sep 2015 20:11:43 +0530
> Subject: [PATCH] drm/mgag200: Prevent calling drm_fb_helper_fini twice
>
> mgag200_fbdev_init's error handling path calls drm_fb_helper_fini before
> bailing out. The error handling path of mgag200_driver_load also ends
> up calling drm_fb_helper_fini.
>
> This results in drm_fb_helper_fini being called twice if the driver load
> drm op fails somewhere in between.
>
> Make only mgag200_driver_unload call drm_fb_helper_fini, remove the call
> from mgag200_fbdev_init.
>
> Signed-off-by: Archit Taneja <architt@codeaurora.org>
> ---
> drivers/gpu/drm/mgag200/mgag200_fb.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c
> b/drivers/gpu/drm/mgag200/mgag200_fb.c
> index 87de15e..6259b0a 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_fb.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
> @@ -280,20 +280,16 @@ int mgag200_fbdev_init(struct mga_device *mdev)
>
> ret = drm_fb_helper_single_add_all_connectors(&mfbdev->helper);
> if (ret)
> - goto fini;
> + return ret;
>
> /* 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;
> + return ret;
>
> return 0;
> -
> -fini:
> - drm_fb_helper_fini(&mfbdev->helper);
> - return ret;
> }
>
> void mgag200_fbdev_fini(struct mga_device *mdev)

So this patch was whitespace damaged - I applied it by hand and made the commit
below. This has solved the crash, thanks Archit!

And yes, you are right that my config probably crashed with older kernels too.

Ingo

=============>
>From 60d733a3ec19dc72372e12207a0a86293cd40cf5 Mon Sep 17 00:00:00 2001
From: Archit Taneja <architt@codeaurora.org>
Date: Mon, 14 Sep 2015 20:53:57 +0530
Subject: [PATCH] drm/mgag200: Fix calling drm_fb_helper_fini() twice

mgag200_fbdev_init()'s error handling path calls
drm_fb_helper_fini() before bailing out. The error handling path
of mgag200_driver_load() also ends up calling drm_fb_helper_fini().

This results in drm_fb_helper_fini() being called twice if the
driver load drm op fails somewhere in between.

Make only mgag200_driver_unload() call drm_fb_helper_fini(), remove
the call from mgag200_fbdev_init().

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Cc: Archit Taneja <archit@ti.com>
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>
Link: http://lkml.kernel.org/r/55F6E68D.8070800@codeaurora.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/gpu/drm/mgag200/mgag200_fb.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index 87de15ea1f93..6259b0a5fc38 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -280,20 +280,16 @@ int mgag200_fbdev_init(struct mga_device *mdev)

ret = drm_fb_helper_single_add_all_connectors(&mfbdev->helper);
if (ret)
- goto fini;
+ return ret;

/* 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;
+ return ret;

return 0;
-
-fini:
- drm_fb_helper_fini(&mfbdev->helper);
- return ret;
}

void mgag200_fbdev_fini(struct mga_device *mdev)