From patchwork Fri Nov 24 17:53:34 2017 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: 841146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="XY8ZEWTO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yk3vB75nsz9s72 for ; Sat, 25 Nov 2017 05:02:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753806AbdKXSCp (ORCPT ); Fri, 24 Nov 2017 13:02:45 -0500 Received: from 78-11-180-123.static.ip.netia.com.pl ([78.11.180.123]:59610 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753794AbdKXSCp (ORCPT ); Fri, 24 Nov 2017 13:02:45 -0500 X-Greylist: delayed 552 seconds by postgrey-1.27 at vger.kernel.org; Fri, 24 Nov 2017 13:02:44 EST Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 3yk3hZ6Dh8z5d; Fri, 24 Nov 2017 18:53:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1511546014; bh=MWchKqP0vXFsMFM6VLslpyle5UMFDw7H4M9j2Difo74=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=XY8ZEWTOcgvHeE3RJEsRRVQeAfT3MSubVp1cnrBzcOAa3JHlrgepKus/3kvQsg04B Iu2n7uhuZmSGqQeJD+AnUWGtxYzFHcaPwsuWQ3k4SlboVukPmVryzOyiZK6yb0jSVB jQDbgDEwDi1P2OWWYGLX0Hn3c/d7FlTywzr9lxDFulLz3jsFeeT0qxRJpj+Wtdvpwn E5a8LF37fX+yYtsNRAjJi9u+IB39zZi+9JAJHA5XRBe2cEqRwaS8+q00oT5BwqZZUr nQD71Id0dHQco2riQEqHSQ+Cb5GyxmT1C6L2ntTynKyGMRojp/bXB8sHSLXoSXg7S5 BBhSzqKCqf++Q== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at rere Date: Fri, 24 Nov 2017 18:53:34 +0100 Message-Id: <89e22ee1c026b40a5bfa91de282d658b56dc8ee8.1511544782.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 13/13] drm/tegra: kick out simplefb MIME-Version: 1.0 To: dri-devel@lists.freedesktop.org Cc: David Airlie , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Kick out firmware fb when loading tegra driver. Signed-off-by: Michał Mirosław --- 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 943bdf88c4a2..1ec66ae29839 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1239,6 +1239,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;