* [PATCH] drm/rockchip: kick firmware-based framebuffer when initializing
@ 2021-05-26 8:55 Icenowy Zheng
2021-05-26 12:00 ` Thomas Zimmermann
0 siblings, 1 reply; 2+ messages in thread
From: Icenowy Zheng @ 2021-05-26 8:55 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, David Airlie, Daniel Vetter
Cc: linux-rockchip, Icenowy Zheng, linux-arm-kernel, dri-devel, linux-kernel
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 <icenowy@aosc.io>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/rockchip: kick firmware-based framebuffer when initializing
2021-05-26 8:55 [PATCH] drm/rockchip: kick firmware-based framebuffer when initializing Icenowy Zheng
@ 2021-05-26 12:00 ` Thomas Zimmermann
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Zimmermann @ 2021-05-26 12:00 UTC (permalink / raw)
To: Icenowy Zheng, Sandy Huang, Heiko Stübner, David Airlie,
Daniel Vetter
Cc: linux-rockchip, dri-devel, linux-arm-kernel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1831 bytes --]
Hi
I think we already fixed this at [1]. Apparently no on epicked it up. If
you awant to test, I'll add your Tested-by before merging the patch.
Best regards
Thomas
[1]
https://lore.kernel.org/dri-devel/20210516074833.451643-1-javierm@redhat.com/
Am 26.05.21 um 10:55 schrieb Icenowy Zheng:
> 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 <icenowy@aosc.io>
> ---
> 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;
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-26 12:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 8:55 [PATCH] drm/rockchip: kick firmware-based framebuffer when initializing Icenowy Zheng
2021-05-26 12:00 ` Thomas Zimmermann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).