bcm27xx: remove linux 5.10 compatibility

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0529-drm-vc4-Use-the-new-helpers.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0529-drm-vc4-Use-the-new-helpers.patch b/target/linux/bcm27xx/patches-5.10/950-0529-drm-vc4-Use-the-new-helpers.patch
deleted file mode 100644 (file)
index db7e7a5..0000000
--- a/target/linux/bcm27xx/patches-5.10/950-0529-drm-vc4-Use-the-new-helpers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b29e72769f843afeb4585c5310f8bf23c0277daf Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 9 Apr 2021 17:31:55 +0200
-Subject: [PATCH] drm/vc4: Use the new helpers
-
-We just introduced new helpers, so let's use them.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -224,21 +224,6 @@ static int vc4_hdmi_connector_get_modes(
-       return ret;
- }
- 
--static bool hdr_metadata_equal(const struct drm_connector_state *old_state,
--                             const struct drm_connector_state *new_state)
--{
--      struct drm_property_blob *old_blob = old_state->hdr_output_metadata;
--      struct drm_property_blob *new_blob = new_state->hdr_output_metadata;
--
--      if (!old_blob || !new_blob)
--              return old_blob == new_blob;
--
--      if (old_blob->length != new_blob->length)
--              return false;
--
--      return !memcmp(old_blob->data, new_blob->data, old_blob->length);
--}
--
- static int vc4_hdmi_connector_atomic_check(struct drm_connector *connector,
-                                         struct drm_atomic_state *state)
- {
-@@ -247,12 +232,13 @@ static int vc4_hdmi_connector_atomic_che
-       struct drm_connector_state *new_state =
-               drm_atomic_get_new_connector_state(state, connector);
-       struct drm_crtc *crtc = new_state->crtc;
--      struct drm_crtc_state *crtc_state;
- 
-       if (!crtc)
-               return 0;
- 
--      if (!hdr_metadata_equal(old_state, new_state)) {
-+      if (!drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
-+              struct drm_crtc_state *crtc_state;
-+
-               crtc_state = drm_atomic_get_crtc_state(state, crtc);
-               if (IS_ERR(crtc_state))
-                       return PTR_ERR(crtc_state);
-@@ -351,8 +337,7 @@ static int vc4_hdmi_connector_init(struc
-       connector->stereo_allowed = 1;
- 
-       if (vc4_hdmi->variant->supports_hdr)
--              drm_object_attach_property(&connector->base,
--                      connector->dev->mode_config.hdr_output_metadata_property, 0);
-+              drm_connector_attach_hdr_output_metadata_property(connector);
- 
-       drm_connector_attach_encoder(connector, encoder);
-