From patchwork Thu Aug 30 21:00:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 10582845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B25E174C for ; Thu, 30 Aug 2018 21:08:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE8A12BE04 for ; Thu, 30 Aug 2018 21:08:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E22422BE40; Thu, 30 Aug 2018 21:08:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BBB232BE04 for ; Thu, 30 Aug 2018 21:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References :In-Reply-To:Message-Id:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ji8KsSO0ELzMI9cOe0gpc9re4BmluaAvt93uIaWecd0=; b=YHdHjFIzfxDr3a qSOAb9Gva2kFxu9/+V6snb2zmODPsV5uch3XKFY9xaWqomMS8izdDxAKPzdT+/yTlayQ9Pi5KcoqW Xsdv+euHloK0gnYi5EN46jiur9cJRHsu9sQ/7pfs4ViK0HXzYjKj728q9rhoV7Ib2bSJtwynB9IoC ArWbJi8gy89/ig+mefO0ION/sCR5zWbOoYfTlqNcRVOJrlsEffD0kQJ6nb6+LfhNAnX5+stjjvCvz 0O5Cqhym7o1J8f8z3T/QZU0V2meJ3VgYQcNzP4ggBIBLyU4xMBEOmO1lAH7k0j18v1H6MJhZj8baq UDgWDs2r9Bsk8HXIkJIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvUAQ-0002Zh-2b; Thu, 30 Aug 2018 21:07:50 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvU3R-00065w-Am for linux-arm-kernel@lists.infradead.org; Thu, 30 Aug 2018 21:00:42 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 421ZcQ66FlzsN; Thu, 30 Aug 2018 22:59:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1535662774; bh=MxtO5Mhr0GkPH8MUP06AqtRLFfui2zInQhDye32pDvw=; h=Date:In-Reply-To:References:From:Subject:To:Cc:Cc:Cc:Cc:Cc:Cc:Cc: Cc:Cc:Cc:Cc:From; b=cwnrwF8H8qsPFbZvUmgcz9SsUAhrF0xoTPmnar+PgwyfY2fL8fVr9jZ/ALTDYo9Mp 1HHbKNtBQ+wyYQi9aV8nAFXiXz/LZuyzu3Jy4xWldE//VQ1pH4z5XNnC4Op6TshFbt O9Fb8mX9DCf8CA73tjmRsI6ym6WnXuUKjgTXnAGELrEGnyxbTEoYocgNc8CtEpYmzh 8fWWM9IyTXs8nlfeYNAfY25LxTZVeBVFgVA1ltrhicF2pZ9SSf01KoZLWGmkPUlNq2 sicgL3vZ50vy/xYJBqt2h2efV4xnfMGPiPjC0u5GMD3d62TX2IcqlPJsLksrxiu9/+ QZoVUSffK+gWQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.0 at mail Date: Thu, 30 Aug 2018 23:00:12 +0200 Message-Id: <985a03e73608bcab0ec84b67edb69e334bd012fe.1535656077.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH v2 12/12] drm/tegra: kick out simplefb MIME-Version: 1.0 To: dri-devel@lists.freedesktop.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180830_140037_647522_4F9E6B7C X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , David Airlie , Eric Anholt , amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, Alex Deucher , Thierry Reding , Gerd Hoffmann , linux-tegra@vger.kernel.org, Maxime Ripard , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Kick out firmware fb when loading Tegra driver. Signed-off-by: Michał Mirosław Acked-by: Daniel Vetter --- drivers/gpu/drm/tegra/drm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 7afe2f635f74..b51ec138fed2 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1203,6 +1203,10 @@ static int host1x_drm_probe(struct host1x_device *dev) dev_set_drvdata(&dev->dev, drm); + err = drm_fb_helper_remove_conflicting_framebuffers(NULL, "tegradrmfb", false); + if (err < 0) + goto unref; + err = drm_dev_register(drm, 0); if (err < 0) goto unref;