bcm27xx: remove linux 5.10 compatibility

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0411-drm-vc4-hvs-Align-the-HVS-atomic-hooks-to-the-new-AP.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0411-drm-vc4-hvs-Align-the-HVS-atomic-hooks-to-the-new-AP.patch b/target/linux/bcm27xx/patches-5.10/950-0411-drm-vc4-hvs-Align-the-HVS-atomic-hooks-to-the-new-AP.patch
deleted file mode 100644 (file)
index 0373e4a..0000000
--- a/target/linux/bcm27xx/patches-5.10/950-0411-drm-vc4-hvs-Align-the-HVS-atomic-hooks-to-the-new-AP.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From d584fdf44b251f77cc29330d17b60be078acb440 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 7 Dec 2020 16:57:11 +0100
-Subject: [PATCH] drm/vc4: hvs: Align the HVS atomic hooks to the new
- API
-
-Since the CRTC setup in vc4 is split between the PixelValves/TXP and the
-HVS, only the PV/TXP atomic hooks were updated in the previous commits, but
-it makes sense to update the HVS ones too.
-
-Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 4 +---
- drivers/gpu/drm/vc4/vc4_drv.h  | 4 ++--
- drivers/gpu/drm/vc4/vc4_hvs.c  | 8 +++++---
- drivers/gpu/drm/vc4/vc4_txp.c  | 8 ++------
- 4 files changed, 10 insertions(+), 14 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -520,8 +520,6 @@ static void vc4_crtc_atomic_disable(stru
- static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
-                                  struct drm_atomic_state *state)
- {
--      struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
--                                                                       crtc);
-       struct drm_device *dev = crtc->dev;
-       struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-       struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc);
-@@ -534,7 +532,7 @@ static void vc4_crtc_atomic_enable(struc
-        */
-       drm_crtc_vblank_on(crtc);
- 
--      vc4_hvs_atomic_enable(crtc, old_state);
-+      vc4_hvs_atomic_enable(crtc, state);
- 
-       if (vc4_encoder->pre_crtc_configure)
-               vc4_encoder->pre_crtc_configure(encoder);
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -926,8 +926,8 @@ extern struct platform_driver vc4_hvs_dr
- void vc4_hvs_stop_channel(struct drm_device *dev, unsigned int output);
- int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output);
- int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state);
--void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
--void vc4_hvs_atomic_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
-+void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
-+void vc4_hvs_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state);
- void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
-                         struct drm_atomic_state *state);
- void vc4_hvs_dump_state(struct drm_device *dev);
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -430,11 +430,12 @@ static void vc4_hvs_update_dlist(struct
- }
- 
- void vc4_hvs_atomic_enable(struct drm_crtc *crtc,
--                         struct drm_crtc_state *old_state)
-+                         struct drm_atomic_state *state)
- {
-       struct drm_device *dev = crtc->dev;
-       struct vc4_dev *vc4 = to_vc4_dev(dev);
--      struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
-+      struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-+      struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(new_crtc_state);
-       struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-       bool oneshot = vc4_state->feed_txp;
- 
-@@ -443,9 +444,10 @@ void vc4_hvs_atomic_enable(struct drm_cr
- }
- 
- void vc4_hvs_atomic_disable(struct drm_crtc *crtc,
--                          struct drm_crtc_state *old_state)
-+                          struct drm_atomic_state *state)
- {
-       struct drm_device *dev = crtc->dev;
-+      struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
-       struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(old_state);
-       unsigned int chan = vc4_state->assigned_channel;
- 
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -406,23 +406,19 @@ static int vc4_txp_atomic_check(struct d
- static void vc4_txp_atomic_enable(struct drm_crtc *crtc,
-                                 struct drm_atomic_state *state)
- {
--      struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
--                                                                       crtc);
-       drm_crtc_vblank_on(crtc);
--      vc4_hvs_atomic_enable(crtc, old_state);
-+      vc4_hvs_atomic_enable(crtc, state);
- }
- 
- static void vc4_txp_atomic_disable(struct drm_crtc *crtc,
-                                  struct drm_atomic_state *state)
- {
--      struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
--                                                                       crtc);
-       struct drm_device *dev = crtc->dev;
- 
-       /* Disable vblank irq handling before crtc is disabled. */
-       drm_crtc_vblank_off(crtc);
- 
--      vc4_hvs_atomic_disable(crtc, old_state);
-+      vc4_hvs_atomic_disable(crtc, state);
- 
-       /*
-        * Make sure we issue a vblank event after disabling the CRTC if