Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754879AbcJTGm1 (ORCPT ); Thu, 20 Oct 2016 02:42:27 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34631 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820AbcJTGm0 (ORCPT ); Thu, 20 Oct 2016 02:42:26 -0400 Date: Thu, 20 Oct 2016 08:42:21 +0200 From: Daniel Vetter To: Stefan Agner Cc: daniel.vetter@ffwll.ch, meng.yi@nxp.com, dri-devel@lists.freedesktop.org, alison.wang@freescale.com, jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none Message-ID: <20161020064221.GK20761@phenom.ffwll.local> Mail-Followup-To: Stefan Agner , meng.yi@nxp.com, dri-devel@lists.freedesktop.org, alison.wang@freescale.com, jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org References: <20161020003221.2941-1-stefan@agner.ch> <20161020003221.2941-2-stefan@agner.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161020003221.2941-2-stefan@agner.ch> X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1130 Lines: 35 On Wed, Oct 19, 2016 at 05:32:19PM -0700, Stefan Agner wrote: > If fbdev emulation is not in use (or not built-in), fb_helper.fbdev > is NULL. Don't call calling drm_fbdev_cma_defio_fini in this case. > > Signed-off-by: Stefan Agner Yeah makes sense. Applied to drm-misc. -Daniel > --- > drivers/gpu/drm/drm_fb_cma_helper.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c > index 1fd6eac..12d654d 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -557,7 +557,8 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_init); > void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma) > { > drm_fb_helper_unregister_fbi(&fbdev_cma->fb_helper); > - drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); > + if (fbdev_cma->fb_helper.fbdev) > + drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev); > drm_fb_helper_release_fbi(&fbdev_cma->fb_helper); > > if (fbdev_cma->fb) { > -- > 2.10.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch