kernel: bump 5.4 to 5.4.99

[openwrt/staging/thess.git] / target / linux / bcm27xx / patches-5.4 / 950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch b/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
index 0f6259e347d9a8e10f54463d3781b8688faed617..a02663ac8b9f5a00f94c59a83bdb3628b57174e8 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
@@ -186,7 +186,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                .pixel_order = HVS_PIXEL_ORDER_XBGR,
        },
        {
-@@ -828,35 +843,6 @@ static int vc4_plane_mode_set(struct drm
+@@ -836,35 +851,6 @@ static int vc4_plane_mode_set(struct drm
                return -EINVAL;
        }
  
@@ -222,7 +222,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        /* Don't waste cycles mixing with plane alpha if the set alpha
         * is opaque or there is no per-pixel alpha information.
         * In any case we use the alpha property value as the fixed alpha.
-@@ -864,20 +850,120 @@ static int vc4_plane_mode_set(struct drm
+@@ -872,20 +858,120 @@ static int vc4_plane_mode_set(struct drm
        mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
                          fb->format->has_alpha;
  
@@ -356,7 +356,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
  
        /* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers
-@@ -1266,6 +1352,10 @@ static bool vc4_format_mod_supported(str
+@@ -1276,6 +1362,10 @@ static bool vc4_format_mod_supported(str
                default:
                        return false;
                }