diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:02:39 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:23 +0200 |
commit | d5c4f24b2af991df2ec24df1a3f906049370f59f (patch) | |
tree | 640c4a349a2fce2b7dbee7ed0115726bd5d9c245 /target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch | |
parent | 99ad84b6d9727a63f99a16e0b8386747262e3433 (diff) | |
download | upstream-d5c4f24b2af991df2ec24df1a3f906049370f59f.tar.gz upstream-d5c4f24b2af991df2ec24df1a3f906049370f59f.tar.bz2 upstream-d5c4f24b2af991df2ec24df1a3f906049370f59f.zip |
bcm27xx: remove linux 5.10 compatibility
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch b/target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch deleted file mode 100644 index 3949941e46..0000000000 --- a/target/linux/bcm27xx/patches-5.10/950-0683-drm-vc4-Simplify-a-bit-the-global-atomic_check.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d88f88dfdce0c6911802cb9a0da0c43ade854183 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard <maxime@cerno.tech> -Date: Fri, 4 Dec 2020 16:11:34 +0100 -Subject: [PATCH] drm/vc4: Simplify a bit the global atomic_check - -When we can't allocate a new channel, we can simply return instead of -having to handle both cases, and that simplifies a bit the code. - -Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> -Signed-off-by: Maxime Ripard <maxime@cerno.tech> ---- - drivers/gpu/drm/vc4/vc4_kms.c | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_kms.c -+++ b/drivers/gpu/drm/vc4/vc4_kms.c -@@ -793,6 +793,7 @@ static int vc4_pv_muxing_atomic_check(st - to_vc4_crtc_state(new_crtc_state); - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - unsigned int matching_channels; -+ unsigned int channel; - - if (vc4->firmware_kms) - continue; -@@ -836,14 +837,12 @@ static int vc4_pv_muxing_atomic_check(st - * but it works so far. - */ - matching_channels = hvs_new_state->unassigned_channels & vc4_crtc->data->hvs_available_channels; -- if (matching_channels) { -- unsigned int channel = ffs(matching_channels) - 1; -- -- new_vc4_crtc_state->assigned_channel = channel; -- hvs_new_state->unassigned_channels &= ~BIT(channel); -- } else { -+ if (!matching_channels) - return -EINVAL; -- } -+ -+ channel = ffs(matching_channels) - 1; -+ new_vc4_crtc_state->assigned_channel = channel; -+ hvs_new_state->unassigned_channels &= ~BIT(channel); - } - - return 0; |