diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 23:42:32 +0100 |
commit | f07e572f6447465d8938679533d604e402b0f066 (patch) | |
tree | cb333bd2a67e59e7c07659514850a0fd55fc825e /target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch | |
parent | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (diff) | |
download | upstream-f07e572f6447465d8938679533d604e402b0f066.tar.gz upstream-f07e572f6447465d8938679533d604e402b0f066.tar.bz2 upstream-f07e572f6447465d8938679533d604e402b0f066.zip |
bcm27xx: import latest patches from the RPi foundation
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>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch b/target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch deleted file mode 100644 index 00a65a9b11..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0603-drm-vc4-The-check-for-assigned-HVS-channels-is-not-a.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 76534156ad6e835ad89135210d565dd5f58e91ab Mon Sep 17 00:00:00 2001 -From: Dave Stevenson <dave.stevenson@raspberrypi.com> -Date: Tue, 11 Feb 2020 15:36:59 +0000 -Subject: [PATCH] drm/vc4: The check for assigned HVS channels is not - applicable firmware_kms - -Channel assignments is only in full KMS, so skip the check -if in firmware kms mode. - -Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> ---- - drivers/gpu/drm/vc4/vc4_kms.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/vc4/vc4_kms.c -+++ b/drivers/gpu/drm/vc4/vc4_kms.c -@@ -579,6 +579,7 @@ static int - vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) - { - unsigned long unassigned_channels = GENMASK(NUM_CHANNELS - 1, 0); -+ struct vc4_dev *vc4 = to_vc4_dev(state->dev); - struct drm_crtc_state *crtc_state; - struct drm_crtc *crtc; - int i, ret; -@@ -590,7 +591,7 @@ vc4_atomic_check(struct drm_device *dev, - bool is_assigned = false; - unsigned int channel; - -- if (!crtc_state->active) -+ if (!crtc_state->active || vc4->firmware_kms) - continue; - - /* |