git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From fbd09981ff7ecefd9514325bdbfa2b4df4b4f017 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Wed, 27 Oct 2021 14:38:50 +0100
   4 Subject: [PATCH] drm/vc4: hdmi: Simplify the connector state retrieval
   5
   6 When we have the entire DRM state, retrieving the connector state only
   7 requires the drm_connector pointer. Fortunately for us, we have
   8 allocated it as a part of the vc4_hdmi structure, so we can retrieve get
   9 a pointer by simply accessing our field in that structure.
  10
  11 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  12 ---
  13  drivers/gpu/drm/vc4/vc4_hdmi.c | 21 +++------------------
  14  1 file changed, 3 insertions(+), 18 deletions(-)
  15
  16 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  17 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  18 @@ -1003,30 +1003,15 @@ static void vc4_hdmi_recenter_fifo(struc
  19                   "VC4_HDMI_FIFO_CTL_RECENTER_DONE");
  20  }
  21
  22 -static struct drm_connector_state *
  23 -vc4_hdmi_encoder_get_connector_state(struct drm_encoder *encoder,
  24 -                                    struct drm_atomic_state *state)
  25 -{
  26 -       struct drm_connector_state *conn_state;
  27 -       struct drm_connector *connector;
  28 -       unsigned int i;
  29 -
  30 -       for_each_new_connector_in_state(state, connector, conn_state, i) {
  31 -               if (conn_state->best_encoder == encoder)
  32 -                       return conn_state;
  33 -       }
  34 -
  35 -       return NULL;
  36 -}
  37 -
  38  static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
  39                                                 struct drm_atomic_state *state)
  40  {
  41 +       struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
  42 +       struct drm_connector *connector = &vc4_hdmi->connector;
  43         struct drm_connector_state *conn_state =
  44 -               vc4_hdmi_encoder_get_connector_state(encoder, state);
  45 +               drm_atomic_get_new_connector_state(state, connector);
  46         struct vc4_hdmi_connector_state *vc4_conn_state =
  47                 conn_state_to_vc4_hdmi_conn_state(conn_state);
  48 -       struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
  49         struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
  50         unsigned long pixel_rate = vc4_conn_state->pixel_rate;
  51         unsigned long bvb_rate, hsm_rate;