Re: [PATCH v3 041/105] drm/vc4: crtc: Move HVS mode config to HVS file

On Wed, May 27, 2020 at 8:50 AM Maxime Ripard maxime@cerno.tech wrote:

Signed-off-by: Maxime Ripard maxime@cerno.tech

drivers/gpu/drm/vc4/vc4_crtc.c | 272 +------------------------------- drivers/gpu/drm/vc4/vc4_drv.h | 5 +- drivers/gpu/drm/vc4/vc4_hvs.c | 298 ++++++++++++++++++++++++++++++++++- 3 files changed, 309 insertions(+), 266 deletions(-)

static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) {

•   struct drm_device *dev = crtc->dev;
  

•   struct vc4_dev *vc4 = to_vc4_dev(dev);
    struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
    struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
  

•   struct drm_display_mode *mode = &crtc->state->adjusted_mode;
  

•   bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE;
    bool debug_dump_regs = false;
  
    if (debug_dump_regs) {
  

@@ -418,42 +372,10 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) drm_print_regset32(&p, &vc4_crtc->regset); }

•   if (vc4_crtc->data->hvs_output == 2) {
  

•           u32 dispctrl;
  

•           u32 dsp3_mux;
  

•           /*
  

•            * SCALER_DISPCTRL_DSP3 = X, where X < 2 means 'connect DSP3 to
  

•            * FIFO X'.
  

•            * SCALER_DISPCTRL_DSP3 = 3 means 'disable DSP 3'.
  

•            *
  

•            * DSP3 is connected to FIFO2 unless the transposer is
  

•            * enabled. In this case, FIFO 2 is directly accessed by the
  

•            * TXP IP, and we need to disable the FIFO2 -> pixelvalve1
  

•            * route.
  

•            */
  

•           if (vc4_state->feed_txp)
  

•                   dsp3_mux = VC4_SET_FIELD(3, SCALER_DISPCTRL_DSP3_MUX);
  

•           else
  

•                   dsp3_mux = VC4_SET_FIELD(2, SCALER_DISPCTRL_DSP3_MUX);
  

•           dispctrl = HVS_READ(SCALER_DISPCTRL) &
  

•                      ~SCALER_DISPCTRL_DSP3_MUX_MASK;
  

•           HVS_WRITE(SCALER_DISPCTRL, dispctrl | dsp3_mux);
  

•   }
  

I just noticed, this block being moved looks like it should probably have been removed as part of patch #33. Cleaning this up I think will impact the following patches.