mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
62b7f5931c
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From d39fee7763d49f3b0bfd57e6cdc014467415d56a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 30 Mar 2020 18:25:10 +0100
|
|
Subject: [PATCH] drm/vc4: Fixup plane init within firmware-kms
|
|
|
|
"drm/vc4: plane: Move additional planes creation to driver" moved
|
|
overlay and cursor plane creation to a global function thata was
|
|
unconditionally run, when it is not wanted in firmware KMS mode.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -291,9 +291,11 @@ static int vc4_drm_bind(struct device *d
|
|
if (ret)
|
|
goto gem_destroy;
|
|
|
|
- ret = vc4_plane_create_additional_planes(drm);
|
|
- if (ret)
|
|
- goto unbind_all;
|
|
+ if (!vc4->firmware_kms) {
|
|
+ ret = vc4_plane_create_additional_planes(drm);
|
|
+ if (ret)
|
|
+ goto unbind_all;
|
|
+ }
|
|
|
|
drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
|
|
|