bcm27xx: switch to 5.15

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
index 5724b865c732615cf5c20a073aaea54290b11d49..a110b7a605d65c20046c9e835795d859351d84b0 100644 (file)
--- a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
@@ -201,7 +201,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
 
 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
 +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -5601,17 +5601,19 @@ static void dm_update_crtc_active_planes
+@@ -5606,17 +5606,19 @@ static void dm_update_crtc_active_planes
  }
  
  static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
@@ -225,7 +225,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
                WARN_ON(1);
                return ret;
        }
-@@ -5622,8 +5624,8 @@ static int dm_crtc_helper_atomic_check(s
+@@ -5627,8 +5629,8 @@ static int dm_crtc_helper_atomic_check(s
         * planes are disabled, which is not supported by the hardware. And there is legacy
         * userspace which stops using the HW cursor altogether in response to the resulting EINVAL.
         */
@@ -724,7 +724,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
                omap_crtc_state->zpos = pri_state->zpos;
 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-@@ -682,20 +682,23 @@ static void rcar_du_crtc_stop(struct rca
+@@ -688,20 +688,23 @@ static void rcar_du_crtc_stop(struct rca
   */
  
  static int rcar_du_crtc_atomic_check(struct drm_crtc *crtc,