target/linux/bcm27xx/patches-5.10/950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch

   1 From 644a25e926abb918dfff7b3122896848ca35d2a1 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Tue, 27 Apr 2021 16:26:39 +0200
   4 Subject: [PATCH] drm/vc4: hdmi: Remove redundant variables
   5
   6 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
   7 ---
   8  drivers/gpu/drm/vc4/vc4_hdmi.c | 26 ++++++++++++--------------
   9  drivers/gpu/drm/vc4/vc4_hdmi.h |  4 ----
  10  2 files changed, 12 insertions(+), 18 deletions(-)
  11
  12 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  13 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  14 @@ -1164,12 +1164,13 @@ static u32 vc5_hdmi_channel_map(struct v
  15  }
  16
  17  /* HDMI audio codec callbacks */
  18 -static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi)
  19 +static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi,
  20 +                                        unsigned int samplerate)
  21  {
  22         u32 hsm_clock = clk_get_rate(vc4_hdmi->audio_clock);
  23         unsigned long n, m;
  24
  25 -       rational_best_approximation(hsm_clock, vc4_hdmi->audio.samplerate,
  26 +       rational_best_approximation(hsm_clock, samplerate,
  27                                     VC4_HD_MAI_SMP_N_MASK >>
  28                                     VC4_HD_MAI_SMP_N_SHIFT,
  29                                     (VC4_HD_MAI_SMP_M_MASK >>
  30 @@ -1181,12 +1182,11 @@ static void vc4_hdmi_audio_set_mai_clock
  31                    VC4_SET_FIELD(m - 1, VC4_HD_MAI_SMP_M));
  32  }
  33
  34 -static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi)
  35 +static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi, unsigned int samplerate)
  36  {
  37         struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
  38         struct drm_crtc *crtc = encoder->crtc;
  39         const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
  40 -       u32 samplerate = vc4_hdmi->audio.samplerate;
  41         u32 n, cts;
  42         u64 tmp;
  43
  44 @@ -1320,27 +1320,25 @@ static int vc4_hdmi_audio_prepare(struct
  45  {
  46         struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
  47         struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
  48 +       unsigned int sample_rate = params->sample_rate;
  49 +       unsigned int channels = params->channels;
  50         u32 audio_packet_config, channel_mask;
  51         u32 channel_map;
  52         u32 mai_audio_format;
  53         u32 mai_sample_rate;
  54
  55         dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
  56 -               params->sample_rate, params->sample_width,
  57 -               params->channels);
  58 -
  59 -       vc4_hdmi->audio.channels = params->channels;
  60 -       vc4_hdmi->audio.samplerate = params->sample_rate;
  61 +               sample_rate, params->sample_width, channels);
  62
  63         HDMI_WRITE(HDMI_MAI_CTL,
  64 -                  VC4_SET_FIELD(params->channels, VC4_HD_MAI_CTL_CHNUM) |
  65 +                  VC4_SET_FIELD(channels, VC4_HD_MAI_CTL_CHNUM) |
  66                    VC4_HD_MAI_CTL_WHOLSMP |
  67                    VC4_HD_MAI_CTL_CHALIGN |
  68                    VC4_HD_MAI_CTL_ENABLE);
  69
  70 -       vc4_hdmi_audio_set_mai_clock(vc4_hdmi);
  71 +       vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
  72
  73 -       mai_sample_rate = sample_rate_to_mai_fmt(vc4_hdmi->audio.samplerate);
  74 +       mai_sample_rate = sample_rate_to_mai_fmt(sample_rate);
  75         if (params->iec.status[0] & IEC958_AES0_NONAUDIO &&
  76             params->channels == 8)
  77                 mai_audio_format = VC4_HDMI_MAI_FORMAT_HBR;
  78 @@ -1358,7 +1356,7 @@ static int vc4_hdmi_audio_prepare(struct
  79                 VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS |
  80                 VC4_SET_FIELD(0x8, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
  81
  82 -       channel_mask = GENMASK(vc4_hdmi->audio.channels - 1, 0);
  83 +       channel_mask = GENMASK(channels - 1, 0);
  84         audio_packet_config |= VC4_SET_FIELD(channel_mask,
  85                                              VC4_HDMI_AUDIO_PACKET_CEA_MASK);
  86
  87 @@ -1377,7 +1375,7 @@ static int vc4_hdmi_audio_prepare(struct
  88         channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask);
  89         HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map);
  90         HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
  91 -       vc4_hdmi_set_n_cts(vc4_hdmi);
  92 +       vc4_hdmi_set_n_cts(vc4_hdmi, sample_rate);
  93
  94         memcpy(&vc4_hdmi->audio.infoframe, &params->cea, sizeof(params->cea));
  95         vc4_hdmi_set_audio_infoframe(encoder);
  96 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
  97 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
  98 @@ -111,13 +111,9 @@ struct vc4_hdmi_audio {
  99         struct snd_soc_dai_link_component cpu;
 100         struct snd_soc_dai_link_component codec;
 101         struct snd_soc_dai_link_component platform;
 102 -       int samplerate;
 103 -       int channels;
 104         struct snd_dmaengine_dai_dma_data dma_data;
 105         struct hdmi_audio_infoframe infoframe;
 106         bool streaming;
 107 -
 108 -       unsigned char iec_status[4];
 109  };
 110
 111  /* General HDMI hardware state. */