kernel: bump 5.15 to 5.15.100

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.15 / 950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch b/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
index 8699bed008ec9c2096895c1d31ccea6e71fa341a..78237355b709d7c388aa4436352db1088d491dfa 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0898-drm-vc4-Consolidate-Hardware-Revision-Check.patch
@@ -227,7 +227,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                /* 48k words of 2x12-bit pixels */
                drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
        else
-@@ -1008,7 +1008,7 @@ static int vc4_hvs_bind(struct device *d
+@@ -1019,7 +1019,7 @@ static int vc4_hvs_bind(struct device *d
                             NULL);
        vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
                             NULL);
@@ -294,7 +294,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        } else {
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -542,10 +542,10 @@ static u32 vc4_lbm_size(struct drm_plane
+@@ -544,10 +544,10 @@ static u32 vc4_lbm_size(struct drm_plane
        }
  
        /* Align it to 64 or 128 (hvs5) bytes */
@@ -307,7 +307,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        return lbm;
  }
-@@ -664,7 +664,7 @@ static int vc4_plane_allocate_lbm(struct
+@@ -666,7 +666,7 @@ static int vc4_plane_allocate_lbm(struct
                ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
                                                 &vc4_state->lbm,
                                                 lbm_size,
@@ -316,7 +316,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                                                 0, 0);
                spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
  
-@@ -1039,7 +1039,7 @@ static int vc4_plane_mode_set(struct drm
+@@ -1041,7 +1041,7 @@ static int vc4_plane_mode_set(struct drm
        mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
                          fb->format->has_alpha;
  
@@ -325,7 +325,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        /* Control word */
                vc4_dlist_write(vc4_state,
                                SCALER_CTL0_VALID |
-@@ -1570,14 +1570,13 @@ static const struct drm_plane_funcs vc4_
+@@ -1572,14 +1572,13 @@ static const struct drm_plane_funcs vc4_
  struct drm_plane *vc4_plane_init(struct drm_device *dev,
                                 enum drm_plane_type type)
  {
@@ -341,7 +341,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        static const uint64_t modifiers[] = {
                DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
                DRM_FORMAT_MOD_BROADCOM_SAND128,
-@@ -1593,7 +1592,7 @@ struct drm_plane *vc4_plane_init(struct
+@@ -1595,7 +1594,7 @@ struct drm_plane *vc4_plane_init(struct
                return ERR_PTR(-ENOMEM);
  
        for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {