target/linux/bcm27xx/patches-5.4/950-0556-drm-vc4-crtc-Turn-static-const-variable-into-a-defin.patch

   1 From c017882242d671cf81256301a3e9a6fc9eefdc13 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Mon, 13 Jan 2020 13:39:32 +0100
   4 Subject: [PATCH] drm/vc4: crtc: Turn static const variable into a
   5  define
   6
   7 The hvs_latency_pix variable doesn't need to be a variable and can just be
   8 defined.
   9
  10 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_crtc.c | 8 +++++---
  13  1 file changed, 5 insertions(+), 3 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
  17 @@ -44,6 +44,8 @@
  18  #include "vc4_drv.h"
  19  #include "vc4_regs.h"
  20
  21 +#define HVS_FIFO_LATENCY_PIX   6
  22 +
  23  #define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset))
  24  #define CRTC_READ(offset) readl(vc4_crtc->regs + (offset))
  25
  26 @@ -227,21 +229,21 @@ vc4_crtc_update_gamma_lut(struct drm_crt
  27         vc4_crtc_lut_load(crtc);
  28  }
  29
  30 +
  31  static u32 vc4_get_fifo_full_level(u32 format)
  32  {
  33         static const u32 fifo_len_bytes = 64;
  34 -       static const u32 hvs_latency_pix = 6;
  35
  36         switch (format) {
  37         case PV_CONTROL_FORMAT_DSIV_16:
  38         case PV_CONTROL_FORMAT_DSIC_16:
  39 -               return fifo_len_bytes - 2 * hvs_latency_pix;
  40 +               return fifo_len_bytes - 2 * HVS_FIFO_LATENCY_PIX;
  41         case PV_CONTROL_FORMAT_DSIV_18:
  42                 return fifo_len_bytes - 14;
  43         case PV_CONTROL_FORMAT_24:
  44         case PV_CONTROL_FORMAT_DSIV_24:
  45         default:
  46 -               return fifo_len_bytes - 3 * hvs_latency_pix;
  47 +               return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX;
  48         }
  49  }
  50