kernel: bump 6.1 to 6.1.86
[openwrt/openwrt.git] / target / linux / bcm27xx / patches-6.1 / 950-0938-drm-vc4-Introduce-generation-number-enum.patch
index 9314c797a0b5534e467eb4e83c0c6cb7a0cc94c9..d904c3d78d7c0832b6542f683f8d968a5c72b56b 100644 (file)
@@ -902,7 +902,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        /* Control word */
                vc4_dlist_write(vc4_state,
                                SCALER_CTL0_VALID |
-@@ -1717,7 +1717,7 @@ struct drm_plane *vc4_plane_init(struct
+@@ -1714,7 +1714,7 @@ struct drm_plane *vc4_plane_init(struct
        };
  
        for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
@@ -911,7 +911,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                        formats[num_formats] = hvs_formats[i].drm;
                        num_formats++;
                }
-@@ -1732,7 +1732,7 @@ struct drm_plane *vc4_plane_init(struct
+@@ -1729,7 +1729,7 @@ struct drm_plane *vc4_plane_init(struct
                return ERR_CAST(vc4_plane);
        plane = &vc4_plane->base;