From patchwork Wed Feb 28 11:25:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 129948 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp908277lja; Wed, 28 Feb 2018 03:27:21 -0800 (PST) X-Google-Smtp-Source: AG47ELt0fjGz1LiK2u2fbzYPH/XNFn2cQAmU0n1LCvPhR3oZJn4A9FVvB1TE+iwBh7WjrPpUv6ln X-Received: by 2002:a17:902:20eb:: with SMTP id v40-v6mr2060778plg.360.1519817241277; Wed, 28 Feb 2018 03:27:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519817241; cv=none; d=google.com; s=arc-20160816; b=PRqazT4w/OdxqJKJS78Hnioc3GKztTE56Vpa3DghmJU6O6OqZh/Jag8c+xKMEp79wH VoZsCaQvS8MxJC1sNE9FW31+8YcZkFNX74P16RyiP8Qqul7P4rj2WPfx0hHWaR4b1drE oBycb1L8BNoQ/fnqfryju97W/0z3fLu6WQedEbTWP4qXqr578duwiyQbHhNDbWqpXP/I 7B0Uzi1o1tFIvzDOH9aUElCFFq5zKST35Th2wCfuVV6dl+dYJIPkESO7iMGOW5cDV3Vq 8WK5XZei8j1hwiLgjjWak2GdLpeOXKKq2wvz4gPgKLH0DpfC4LdV7rcEwlsdRQ3WtpdZ EFNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=Fty4E14tAgvth6dGmT1eKO60zqBir8VfgwOUiDXqStM=; b=1En7RymhDTvT7qv498Mk0RfxXS0lDTfw858DwbGfWraZDyDyLixsW1rRZ+7GFWSZaN 1IUt5szZhNEZgKsSmdNNVK0icO1rKj4RvTVxi83c49ClVS8+p8de9nDjfcpnlbOf1wzm WUZ2hNB/Wh5uVupAbV5AYwoT838WsJ/Ai3oWfvZ7lMkzEEomSqZxrvzZOvDw95NqosTq vXmhKPvH7REMQYuHXaC444FBrQmwfAbaUtJenTupLEuYliwTaB49PzdHq6475LvhbiOi IglRNZUSA22ubnKDwpVEhCwFmt3w9IVQiY6D6la0GW/ywQXNrk//R844BBF3cQ6gxt3k 4ZAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=dwoGt80E; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id p1si918941pgc.280.2018.02.28.03.27.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2018 03:27:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=dwoGt80E; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D89E6E91C; Wed, 28 Feb 2018 11:27:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AF646E092 for ; Wed, 28 Feb 2018 11:27:17 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1SBRFMF004149; Wed, 28 Feb 2018 05:27:15 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1519817235; bh=joxRxt8RvGGK2WtUY0f89WEIRpK6lujjYbTFsQwaZbM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=dwoGt80EDCsXi7nyyJdu3DWfgsMLXVCkP0FqYv5GDJEjbfMGXrrpy1i1zNh1r09a8 xI9sHumtEPzxMZH96cHXnrhz9wVy9hgYrZLGkKmlzho78xTNM/KofCWncIJGYYKYVw IqQ7lljwYUstutokmfTYhFvOYEyKF0jhTVz8gMfE= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1SBRFGF031240; Wed, 28 Feb 2018 05:27:15 -0600 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Wed, 28 Feb 2018 05:27:14 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Wed, 28 Feb 2018 05:27:14 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1SBRAfK024563; Wed, 28 Feb 2018 05:27:13 -0600 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCHv2 01/17] drm/omap: fix omap_fbdev_free() when omap_fbdev_create() wasn't called Date: Wed, 28 Feb 2018 13:25:58 +0200 Message-ID: <1519817174-20714-2-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519817174-20714-1-git-send-email-tomi.valkeinen@ti.com> References: <1519817174-20714-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Ujfalusi , Tomi Valkeinen , Jyri Sarha Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If we have no crtcs/connectors, fbdev init goes fine, but omap_fbdev_create() is never called. This means that omap_fbdev->bo is NULL and omap_fbdev_free() crashes. Add a check to omap_fbdev_free() to handle the NULL case. Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart Reviewed-by: Sebastian Reichel --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 1ace63e2ff22..632ebcf2165f 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -303,7 +303,8 @@ void omap_fbdev_free(struct drm_device *dev) fbdev = to_omap_fbdev(priv->fbdev); /* unpin the GEM object pinned in omap_fbdev_create() */ - omap_gem_unpin(fbdev->bo); + if (fbdev->bo) + omap_gem_unpin(fbdev->bo); /* this will free the backing object */ if (fbdev->fb)