From patchwork Sat Sep 1 14:08:51 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: 10584779 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 5E62617DE for ; Sat, 1 Sep 2018 14:08:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F2D12A20B for ; Sat, 1 Sep 2018 14:08:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 530262A218; Sat, 1 Sep 2018 14:08:54 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF572A20B for ; Sat, 1 Sep 2018 14:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727389AbeIASVD (ORCPT ); Sat, 1 Sep 2018 14:21:03 -0400 Received: from 183.pool-64.klikom.net ([91.227.64.183]:63653 "EHLO rere.qmqm.pl" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1727271AbeIASVD (ORCPT ); Sat, 1 Sep 2018 14:21:03 -0400 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 422dNt0Zc2zsB; Sat, 1 Sep 2018 16:08:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1535810894; bh=MxtO5Mhr0GkPH8MUP06AqtRLFfui2zInQhDye32pDvw=; h=Date:In-Reply-To:References:From:Subject:To:Cc:Cc:From; b=Yhp3Tp6EQXbfc0dSesPwSojrVm80yMMtxs0yG9v81ZFXoECCQhjbYEutwfk37OEE9 Zet9Ziqg0TJeO5X2+ajB80EWwLXhxD1nu2NYsN6z/OILiw2qhTC6AGOEuav28rVXU8 q0oNRyS/p9MbVgi9idGghRffSk82id74eV60wuXkFeAZBeSflB0+8kBJjKaSMPgEoK rEIAU9d6BEJaSHVd5XxemeqtTWfbMJwsxT/0ER4fFeByqOByBi8zIP/8IoU6d6xenE /DVF+znYsb5WTNwak+vA8CkyVdrPFl/OiTw9T38mp/b2NQ/YnrUXCe5bG5OGDiV7f+ oJb79Vy2E0crA== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.0 at mail Date: Sat, 01 Sep 2018 16:08:51 +0200 Message-Id: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH v3 13/13] drm/tegra: kick out simplefb MIME-Version: 1.0 To: dri-devel@lists.freedesktop.org Cc: Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Cc: Alex Deucher , amd-gfx@lists.freedesktop.org, Bartlomiej Zolnierkiewicz , Dave Airlie , David Airlie , Eric Anholt , Gerd Hoffmann , linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, Maxime Ripard , virtualization@lists.linux-foundation.org Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.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;