target/linux/bcm27xx/patches-6.1/950-0981-drm-vc4-fkms-Rename-plane-related-functions.patch

   1 From 3d849ab48cecab55862a4f2742f11937d66ba54b Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Fri, 14 Apr 2023 11:21:34 +0200
   4 Subject: [PATCH] drm/vc4: fkms: Rename plane related functions
   5
   6 The name collide with the Full KMS functions that are going to be made
   7 public.
   8
   9 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  10 ---
  11  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 14 +++++++-------
  12  1 file changed, 7 insertions(+), 7 deletions(-)
  13
  14 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  15 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  16 @@ -670,8 +670,8 @@ static int vc4_plane_to_mb(struct drm_pl
  17         return 0;
  18  }
  19
  20 -static int vc4_plane_atomic_check(struct drm_plane *plane,
  21 -                                 struct drm_atomic_state *state)
  22 +static int vc4_fkms_plane_atomic_check(struct drm_plane *plane,
  23 +                                      struct drm_atomic_state *state)
  24  {
  25         struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
  26                                                                                  plane);
  27 @@ -728,7 +728,7 @@ static int vc4_plane_atomic_async_check(
  28  }
  29
  30  /* Called during init to allocate the plane's atomic state. */
  31 -static void vc4_plane_reset(struct drm_plane *plane)
  32 +static void vc4_fkms_plane_reset(struct drm_plane *plane)
  33  {
  34         struct vc4_plane_state *vc4_state;
  35
  36 @@ -788,7 +788,7 @@ static bool vc4_fkms_format_mod_supporte
  37         }
  38  }
  39
  40 -static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
  41 +static struct drm_plane_state *vc4_fkms_plane_duplicate_state(struct drm_plane *plane)
  42  {
  43         struct vc4_plane_state *vc4_state;
  44
  45 @@ -809,8 +809,8 @@ static const struct drm_plane_funcs vc4_
  46         .disable_plane = drm_atomic_helper_disable_plane,
  47         .destroy = vc4_plane_destroy,
  48         .set_property = NULL,
  49 -       .reset = vc4_plane_reset,
  50 -       .atomic_duplicate_state = vc4_plane_duplicate_state,
  51 +       .reset = vc4_fkms_plane_reset,
  52 +       .atomic_duplicate_state = vc4_fkms_plane_duplicate_state,
  53         .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
  54         .format_mod_supported = vc4_fkms_format_mod_supported,
  55  };
  56 @@ -818,7 +818,7 @@ static const struct drm_plane_funcs vc4_
  57  static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
  58         .prepare_fb = drm_gem_plane_helper_prepare_fb,
  59         .cleanup_fb = NULL,
  60 -       .atomic_check = vc4_plane_atomic_check,
  61 +       .atomic_check = vc4_fkms_plane_atomic_check,
  62         .atomic_update = vc4_plane_atomic_update,
  63         .atomic_disable = vc4_plane_atomic_disable,
  64         .atomic_async_check = vc4_plane_atomic_async_check,