kernel: bump 4.14 to 4.14.99

[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.14 / 950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch

diff --git a/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch b/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch
index 6eaae48b0f9d478853deb48b8a60238d8ea7f97e..778fe67630d1d1345d7b9f0e0b5ab28ff2339766 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0345-drm-vc4-Check-if-plane-requires-background-fill.patch
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-3-git-send-
  };
  
  static inline struct vc4_plane_state *
-@@ -522,6 +528,7 @@ static int vc4_plane_mode_set(struct drm
+@@ -524,6 +530,7 @@ static int vc4_plane_mode_set(struct drm
        u32 ctl0_offset = vc4_state->dlist_count;
        const struct hvs_format *format = vc4_get_hvs_format(fb->format->format);
        int num_planes = drm_format_num_planes(format->drm);
@@ -44,7 +44,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-3-git-send-
        u32 scl0, scl1, pitch0;
        u32 lbm_size, tiling;
        unsigned long irqflags;
-@@ -705,6 +712,16 @@ static int vc4_plane_mode_set(struct drm
+@@ -707,6 +714,16 @@ static int vc4_plane_mode_set(struct drm
        vc4_state->dlist[ctl0_offset] |=
                VC4_SET_FIELD(vc4_state->dlist_count, SCALER_CTL0_SIZE);