target/linux/bcm27xx/patches-6.1/950-0477-drm-atomic-Constify-the-old-new-state-accessors.patch

   1 From d094cf748495c8c9be15bbbf9801237c8e390c8a Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Wed, 23 Nov 2022 16:25:51 +0100
   4 Subject: [PATCH] drm/atomic: Constify the old/new state accessors
   5
   6 The drm_atomic_get_(old|new)_*_state don't modify the passed
   7 drm_atomic_state, so we can make it const.
   8
   9 Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
  10 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-9-051a0bb60a16@cerno.tech
  12 ---
  13  drivers/gpu/drm/drm_atomic.c | 12 ++++++------
  14  include/drm/drm_atomic.h     | 32 ++++++++++++++++----------------
  15  2 files changed, 22 insertions(+), 22 deletions(-)
  16
  17 --- a/drivers/gpu/drm/drm_atomic.c
  18 +++ b/drivers/gpu/drm/drm_atomic.c
  19 @@ -880,7 +880,7 @@ EXPORT_SYMBOL(drm_atomic_get_private_obj
  20   * or NULL if the private_obj is not part of the global atomic state.
  21   */
  22  struct drm_private_state *
  23 -drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
  24 +drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
  25                                      struct drm_private_obj *obj)
  26  {
  27         int i;
  28 @@ -902,7 +902,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_private
  29   * or NULL if the private_obj is not part of the global atomic state.
  30   */
  31  struct drm_private_state *
  32 -drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
  33 +drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
  34                                      struct drm_private_obj *obj)
  35  {
  36         int i;
  37 @@ -934,7 +934,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_private
  38   * not connected.
  39   */
  40  struct drm_connector *
  41 -drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
  42 +drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
  43                                          struct drm_encoder *encoder)
  44  {
  45         struct drm_connector_state *conn_state;
  46 @@ -968,7 +968,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_connect
  47   * not connected.
  48   */
  49  struct drm_connector *
  50 -drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
  51 +drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
  52                                          struct drm_encoder *encoder)
  53  {
  54         struct drm_connector_state *conn_state;
  55 @@ -1118,7 +1118,7 @@ EXPORT_SYMBOL(drm_atomic_get_bridge_stat
  56   * the bridge is not part of the global atomic state.
  57   */
  58  struct drm_bridge_state *
  59 -drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
  60 +drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
  61                                 struct drm_bridge *bridge)
  62  {
  63         struct drm_private_state *obj_state;
  64 @@ -1140,7 +1140,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_bridge_
  65   * the bridge is not part of the global atomic state.
  66   */
  67  struct drm_bridge_state *
  68 -drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
  69 +drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
  70                                 struct drm_bridge *bridge)
  71  {
  72         struct drm_private_state *obj_state;
  73 --- a/include/drm/drm_atomic.h
  74 +++ b/include/drm/drm_atomic.h
  75 @@ -515,17 +515,17 @@ struct drm_private_state * __must_check
  76  drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
  77                                  struct drm_private_obj *obj);
  78  struct drm_private_state *
  79 -drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
  80 +drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
  81                                      struct drm_private_obj *obj);
  82  struct drm_private_state *
  83 -drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
  84 +drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
  85                                      struct drm_private_obj *obj);
  86
  87  struct drm_connector *
  88 -drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
  89 +drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
  90                                          struct drm_encoder *encoder);
  91  struct drm_connector *
  92 -drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
  93 +drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
  94                                          struct drm_encoder *encoder);
  95
  96  /**
  97 @@ -540,7 +540,7 @@ drm_atomic_get_new_connector_for_encoder
  98   * @drm_atomic_get_new_crtc_state should be used instead.
  99   */
 100  static inline struct drm_crtc_state *
 101 -drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
 102 +drm_atomic_get_existing_crtc_state(const struct drm_atomic_state *state,
 103                                    struct drm_crtc *crtc)
 104  {
 105         return state->crtcs[drm_crtc_index(crtc)].state;
 106 @@ -555,7 +555,7 @@ drm_atomic_get_existing_crtc_state(struc
 107   * NULL if the CRTC is not part of the global atomic state.
 108   */
 109  static inline struct drm_crtc_state *
 110 -drm_atomic_get_old_crtc_state(struct drm_atomic_state *state,
 111 +drm_atomic_get_old_crtc_state(const struct drm_atomic_state *state,
 112                               struct drm_crtc *crtc)
 113  {
 114         return state->crtcs[drm_crtc_index(crtc)].old_state;
 115 @@ -569,7 +569,7 @@ drm_atomic_get_old_crtc_state(struct drm
 116   * NULL if the CRTC is not part of the global atomic state.
 117   */
 118  static inline struct drm_crtc_state *
 119 -drm_atomic_get_new_crtc_state(struct drm_atomic_state *state,
 120 +drm_atomic_get_new_crtc_state(const struct drm_atomic_state *state,
 121                               struct drm_crtc *crtc)
 122  {
 123         return state->crtcs[drm_crtc_index(crtc)].new_state;
 124 @@ -587,7 +587,7 @@ drm_atomic_get_new_crtc_state(struct drm
 125   * @drm_atomic_get_new_plane_state should be used instead.
 126   */
 127  static inline struct drm_plane_state *
 128 -drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
 129 +drm_atomic_get_existing_plane_state(const struct drm_atomic_state *state,
 130                                     struct drm_plane *plane)
 131  {
 132         return state->planes[drm_plane_index(plane)].state;
 133 @@ -602,7 +602,7 @@ drm_atomic_get_existing_plane_state(stru
 134   * NULL if the plane is not part of the global atomic state.
 135   */
 136  static inline struct drm_plane_state *
 137 -drm_atomic_get_old_plane_state(struct drm_atomic_state *state,
 138 +drm_atomic_get_old_plane_state(const struct drm_atomic_state *state,
 139                                struct drm_plane *plane)
 140  {
 141         return state->planes[drm_plane_index(plane)].old_state;
 142 @@ -617,7 +617,7 @@ drm_atomic_get_old_plane_state(struct dr
 143   * NULL if the plane is not part of the global atomic state.
 144   */
 145  static inline struct drm_plane_state *
 146 -drm_atomic_get_new_plane_state(struct drm_atomic_state *state,
 147 +drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,
 148                                struct drm_plane *plane)
 149  {
 150         return state->planes[drm_plane_index(plane)].new_state;
 151 @@ -635,7 +635,7 @@ drm_atomic_get_new_plane_state(struct dr
 152   * @drm_atomic_get_new_connector_state should be used instead.
 153   */
 154  static inline struct drm_connector_state *
 155 -drm_atomic_get_existing_connector_state(struct drm_atomic_state *state,
 156 +drm_atomic_get_existing_connector_state(const struct drm_atomic_state *state,
 157                                         struct drm_connector *connector)
 158  {
 159         int index = drm_connector_index(connector);
 160 @@ -655,7 +655,7 @@ drm_atomic_get_existing_connector_state(
 161   * or NULL if the connector is not part of the global atomic state.
 162   */
 163  static inline struct drm_connector_state *
 164 -drm_atomic_get_old_connector_state(struct drm_atomic_state *state,
 165 +drm_atomic_get_old_connector_state(const struct drm_atomic_state *state,
 166                                    struct drm_connector *connector)
 167  {
 168         int index = drm_connector_index(connector);
 169 @@ -675,7 +675,7 @@ drm_atomic_get_old_connector_state(struc
 170   * or NULL if the connector is not part of the global atomic state.
 171   */
 172  static inline struct drm_connector_state *
 173 -drm_atomic_get_new_connector_state(struct drm_atomic_state *state,
 174 +drm_atomic_get_new_connector_state(const struct drm_atomic_state *state,
 175                                    struct drm_connector *connector)
 176  {
 177         int index = drm_connector_index(connector);
 178 @@ -713,7 +713,7 @@ drm_atomic_get_new_connector_state(struc
 179   * Read-only pointer to the current plane state.
 180   */
 181  static inline const struct drm_plane_state *
 182 -__drm_atomic_get_current_plane_state(struct drm_atomic_state *state,
 183 +__drm_atomic_get_current_plane_state(const struct drm_atomic_state *state,
 184                                      struct drm_plane *plane)
 185  {
 186         if (state->planes[drm_plane_index(plane)].state)
 187 @@ -1134,10 +1134,10 @@ struct drm_bridge_state *
 188  drm_atomic_get_bridge_state(struct drm_atomic_state *state,
 189                             struct drm_bridge *bridge);
 190  struct drm_bridge_state *
 191 -drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
 192 +drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
 193                                 struct drm_bridge *bridge);
 194  struct drm_bridge_state *
 195 -drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
 196 +drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
 197                                 struct drm_bridge *bridge);
 198
 199  #endif /* DRM_ATOMIC_H_ */