From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756293AbcJTAdk (ORCPT ); Wed, 19 Oct 2016 20:33:40 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:45281 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753061AbcJTAcr (ORCPT ); Wed, 19 Oct 2016 20:32:47 -0400 From: Stefan Agner To: daniel.vetter@ffwll.ch, meng.yi@nxp.com, dri-devel@lists.freedesktop.org Cc: alison.wang@freescale.com, jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none Date: Wed, 19 Oct 2016 17:32:19 -0700 Message-Id: <20161020003221.2941-2-stefan@agner.ch> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161020003221.2941-1-stefan@agner.ch> References: <20161020003221.2941-1-stefan@agner.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Agner Subject: [PATCH 1/3] drm/fb_cma_helper: do not free fbdev if there is none Date: Wed, 19 Oct 2016 17:32:19 -0700 Message-ID: <20161020003221.2941-2-stefan@agner.ch> References: <20161020003221.2941-1-stefan@agner.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kmu-office.ch (mail.kmu-office.ch [IPv6:2a02:418:6a02::a2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 942406EA3D for ; Thu, 20 Oct 2016 00:32:47 +0000 (UTC) In-Reply-To: <20161020003221.2941-1-stefan@agner.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: daniel.vetter@ffwll.ch, meng.yi@nxp.com, dri-devel@lists.freedesktop.org Cc: jianwei.wang.chn@gmail.com, linux-kernel@vger.kernel.org, alison.wang@freescale.com List-Id: dri-devel@lists.freedesktop.org SWYgZmJkZXYgZW11bGF0aW9uIGlzIG5vdCBpbiB1c2UgKG9yIG5vdCBidWlsdC1pbiksIGZiX2hl bHBlci5mYmRldgppcyBOVUxMLiBEb24ndCBjYWxsIGNhbGxpbmcgZHJtX2ZiZGV2X2NtYV9kZWZp b19maW5pIGluIHRoaXMgY2FzZS4KClNpZ25lZC1vZmYtYnk6IFN0ZWZhbiBBZ25lciA8c3RlZmFu QGFnbmVyLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hlbHBlci5jIHwgMyAr Ky0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2NtYV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZmJfY21hX2hlbHBlci5jCmluZGV4IDFmZDZlYWMuLjEyZDY1NGQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZmJfY21hX2hlbHBlci5jCkBAIC01NTcsNyArNTU3LDggQEAgRVhQT1JUX1NZTUJP TF9HUEwoZHJtX2ZiZGV2X2NtYV9pbml0KTsKIHZvaWQgZHJtX2ZiZGV2X2NtYV9maW5pKHN0cnVj dCBkcm1fZmJkZXZfY21hICpmYmRldl9jbWEpCiB7CiAJZHJtX2ZiX2hlbHBlcl91bnJlZ2lzdGVy X2ZiaSgmZmJkZXZfY21hLT5mYl9oZWxwZXIpOwotCWRybV9mYmRldl9jbWFfZGVmaW9fZmluaShm YmRldl9jbWEtPmZiX2hlbHBlci5mYmRldik7CisJaWYgKGZiZGV2X2NtYS0+ZmJfaGVscGVyLmZi ZGV2KQorCQlkcm1fZmJkZXZfY21hX2RlZmlvX2ZpbmkoZmJkZXZfY21hLT5mYl9oZWxwZXIuZmJk ZXYpOwogCWRybV9mYl9oZWxwZXJfcmVsZWFzZV9mYmkoJmZiZGV2X2NtYS0+ZmJfaGVscGVyKTsK IAogCWlmIChmYmRldl9jbWEtPmZiKSB7Ci0tIAoyLjEwLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=