Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5183996pxj; Wed, 26 May 2021 05:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCbuKcurWgRpDhMgJ8LSxaU1RuP7jJHqMSmL0cEfejHGxVpC3ODMpqgJhrU6lkE7vJACL7 X-Received: by 2002:a17:906:f885:: with SMTP id lg5mr33041810ejb.313.1622030522145; Wed, 26 May 2021 05:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622030522; cv=none; d=google.com; s=arc-20160816; b=NucUlOAZFL5a7WJPFEshgruTKHPLntzZoQSgEGXHsa70ZB2HmHP5UNij5jT+IqEDdB xYF6C0gppHeWfWjzdVcO2q3bPi+s1+FbsleqG/1bFAWSdPl0PgPk/T/jWrkyq839zs53 M/3h+SR532fCTGfx+GWjx1RxQzObAfDixUIgt/3qkjo+O4LwZ4TMqUGUUQHILIGMjgFA fbDLWtsEq4eAj89krvn02FBJ/yJL1XoJTKSjHLAZK5TJTLpiE2KrrDVYS0KaqX7tZs2r ssOL/rRwK1dOig2dMyDElpB3Fw5liiitfiSHEADoAilujGxI5gDhUjs3qAv5TvUzgOmf 0rzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:ai-spam-status :dkim-signature; bh=i9FNsrDVzHXlG+NrZcS1HJzc7QHLE+btsOh+RiF692U=; b=TG7UfNYaPhUqqApg7Mj1h1uDAV8VB/Xsbx7Ymv69s9mGFkQ2uX2zFasYiQ/wlxEMqq SS+aLmSs6Ij3Z3urC9h/qDNFe4rt2SK1U90x9kfH6soqkpZM97DzEHtfPPAUzP/QrEV8 HJVbOah9z+xRcPw+s4G7uYdGcq+iCLSdJGI1SBmcFNrs+oPQyfa+Ul5bZnUrVqr9apzM 4aNwCQEtN+rfRItvSIvqRht20LDI5EIu9blUk1rkuyZl5PcNKjMfXTHQ1PZZAtMOaoq0 vHost3WfcDPptPrfIEovWs3Pk8yTSjHZU9NNbLXLCQQt8SLVghu6koCeubnu6RbTgEdl LKUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mymailcheap.com header.s=default header.b=fSuwiphz; dkim=fail header.i=@aosc.io header.s=default header.b=P7m6Mg4D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w24si17871346edv.320.2021.05.26.05.01.38; Wed, 26 May 2021 05:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@mymailcheap.com header.s=default header.b=fSuwiphz; dkim=fail header.i=@aosc.io header.s=default header.b=P7m6Mg4D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233523AbhEZJEV (ORCPT + 99 others); Wed, 26 May 2021 05:04:21 -0400 Received: from relay-us1.mymailcheap.com ([51.81.35.219]:40688 "EHLO relay-us1.mymailcheap.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233509AbhEZJET (ORCPT ); Wed, 26 May 2021 05:04:19 -0400 X-Greylist: delayed 414 seconds by postgrey-1.27 at vger.kernel.org; Wed, 26 May 2021 05:04:19 EDT Received: from relay5.mymailcheap.com (relay5.mymailcheap.com [159.100.248.207]) by relay-us1.mymailcheap.com (Postfix) with ESMTPS id 2EF21201BA for ; Wed, 26 May 2021 08:55:53 +0000 (UTC) Received: from relay1.mymailcheap.com (relay1.mymailcheap.com [144.217.248.102]) by relay5.mymailcheap.com (Postfix) with ESMTPS id 9A258260EB for ; Wed, 26 May 2021 08:55:50 +0000 (UTC) Received: from filter2.mymailcheap.com (filter2.mymailcheap.com [91.134.140.82]) by relay1.mymailcheap.com (Postfix) with ESMTPS id 504BC3F201; Wed, 26 May 2021 08:55:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by filter2.mymailcheap.com (Postfix) with ESMTP id 9958E2A4EA; Wed, 26 May 2021 10:55:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mymailcheap.com; s=default; t=1622019347; bh=HzXnVDL+eq6faYvFYt2GOI6RK0yzFGyo9W7BPLfmG0g=; h=From:To:Cc:Subject:Date:From; b=fSuwiphzZlhL1cMD5Cj3QYTOu+Yvl5iNwj/bSNc3ThmDxCWLv62bw81XxLhAZNrQK s8jMaRuCv6nYAZw4ZyQ0WEUeluvKlgubslfXS918875kZZuOeKQ6TML3EnlZwzr4B/ FCInPSiGnguE4uF0hmrqqNiLwn6D/3Vpj2969UE0= X-Virus-Scanned: Debian amavisd-new at filter2.mymailcheap.com Received: from filter2.mymailcheap.com ([127.0.0.1]) by localhost (filter2.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RewCjoZoBAsj; Wed, 26 May 2021 10:55:46 +0200 (CEST) Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by filter2.mymailcheap.com (Postfix) with ESMTPS; Wed, 26 May 2021 10:55:46 +0200 (CEST) Received: from [213.133.102.83] (ml.mymailcheap.com [213.133.102.83]) by mail20.mymailcheap.com (Postfix) with ESMTP id 7DFA440C3F; Wed, 26 May 2021 08:55:45 +0000 (UTC) Authentication-Results: mail20.mymailcheap.com; dkim=pass (1024-bit key; unprotected) header.d=aosc.io header.i=@aosc.io header.b="P7m6Mg4D"; dkim-atps=neutral AI-Spam-Status: Not processed Received: from ice-e5v2.lan (unknown [59.41.160.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail20.mymailcheap.com (Postfix) with ESMTPSA id 2A7E040C3F; Wed, 26 May 2021 08:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; t=1622019339; bh=HzXnVDL+eq6faYvFYt2GOI6RK0yzFGyo9W7BPLfmG0g=; h=From:To:Cc:Subject:Date:From; b=P7m6Mg4DoJv6hY9eNTU3V3cdRyogc9THL/qL9khspBOJmjtaUD+evzBn0U1iS0o+Q xFb8XN/UFmUH4keCbl5S3afkCOLOjOdtwO1VJHXqrOVrQ1Hzp6mXiZE7Q9CILW0JVr uTfMzx7mejTrAACEYw/XP3N2Rvaq6C7zV7tKX5cY= From: Icenowy Zheng To: Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH] drm/rockchip: kick firmware-based framebuffer when initializing Date: Wed, 26 May 2021 16:55:27 +0800 Message-Id: <20210526085527.155840-1-icenowy@aosc.io> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [4.90 / 20.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[aosc.io:s=default]; RECEIVED_SPAMHAUS_PBL(0.00)[59.41.160.199:received]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[aosc.io]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; ML_SERVERS(-3.10)[213.133.102.83]; DKIM_TRACE(0.00)[aosc.io:+]; RCPT_COUNT_SEVEN(0.00)[9]; MID_CONTAINS_FROM(1.00)[]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; RCVD_COUNT_TWO(0.00)[2]; HFILTER_HELO_BAREIP(3.00)[213.133.102.83,1] X-Rspamd-Queue-Id: 7DFA440C3F X-Rspamd-Server: mail20.mymailcheap.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since U-Boot now supports EFI and FB passing via EFI GOP, when booting rockchip SoCs via EFI, a EFI FB is available. However, currently when re-initializing display pipeline, the EFI FB is not removed, lead to fbcon not working (because the EFI FB is no longer bound to the display pipeline although it's still /dev/fb0 and fbcon is bound to it). Add some code for removing firmware-based FB when initializing KMS of rockchipdrm. Tested on Pinebook Pro (RK3399) with U-Boot patchset for initializing eDP display applied. Signed-off-by: Icenowy Zheng --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 212bd87c0c4a..3905fce6ce0b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -158,6 +158,9 @@ static int rockchip_drm_bind(struct device *dev) */ drm_dev->irq_enabled = true; + /* Remove early framebuffers (ie. efifb) */ + drm_fb_helper_remove_conflicting_framebuffers(NULL, "rockchipdrmfb", false); + ret = rockchip_drm_fbdev_init(drm_dev); if (ret) goto err_unbind_all; -- 2.30.2