From f07e572f6447465d8938679533d604e402b0f066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 18 Feb 2021 18:04:33 +0100 Subject: bcm27xx: import latest patches from the RPi foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ...-resolution-of-7680-is-conditional-on-bei.patch | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.4/950-0257-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch (limited to 'target/linux/bcm27xx/patches-5.4/950-0257-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch') diff --git a/target/linux/bcm27xx/patches-5.4/950-0257-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch b/target/linux/bcm27xx/patches-5.4/950-0257-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch deleted file mode 100644 index 63931bf611..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0257-drm-vc4-Max-resolution-of-7680-is-conditional-on-bei.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2767f778820bd7392688512ec2996943a586db6e Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Thu, 30 May 2019 15:55:15 +0100 -Subject: [PATCH] drm/vc4: Max resolution of 7680 is conditional on - being Pi4 - -The max resolution had been increased from 2048 to 7680 for all -platforms. This code is common with Pi0-3 which have a max render -target for GL of 2048, therefore the increased resolution has to -be conditional on the platform. -Switch based on whether the bcm2835-v3d node is found, as that is -not present on Pi4. (There is a potential configuration on Pi0-3 -with no v3d, but this is very unlikely). - -Signed-off-by: Dave Stevenson ---- - drivers/gpu/drm/vc4/vc4_kms.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_kms.c -+++ b/drivers/gpu/drm/vc4/vc4_kms.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #include "vc4_drv.h" - #include "vc4_regs.h" -@@ -536,8 +537,14 @@ int vc4_kms_load(struct drm_device *dev) - return ret; - } - -- dev->mode_config.max_width = 7680; -- dev->mode_config.max_height = 7680; -+ if (!drm_core_check_feature(dev, DRIVER_RENDER)) { -+ /* No V3D as part of vc4. Assume this is Pi4. */ -+ dev->mode_config.max_width = 7680; -+ dev->mode_config.max_height = 7680; -+ } else { -+ dev->mode_config.max_width = 2048; -+ dev->mode_config.max_height = 2048; -+ } - dev->mode_config.funcs = &vc4_mode_funcs; - dev->mode_config.preferred_depth = 24; - dev->mode_config.async_page_flip = true; -- cgit v1.2.3