drm/vc4: crtc: Move PV dump to config_pv

Now that we only configure the PixelValve in vc4_crtc_config_pv, it doesn't
really make much sense to dump its register content in its caller.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c195af7d9e140a2a6db32992ee7e54071c6f94ba.1599120059.git-series.maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index c2ab907611e321a826a06a9a1b5fa5dfddfb4edb..181d3fd57bc76a1e440938be467b0eaafb4e16ef 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -290,6 +290,14 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
                       vc4_encoder->type == VC4_ENCODER_TYPE_DSI1);
        u32 format = is_dsi ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
        u8 ppc = pv_data->pixels_per_clock;
+       bool debug_dump_regs = false;
+
+       if (debug_dump_regs) {
+               struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
+               dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs before:\n",
+                        drm_crtc_index(crtc));
+               drm_print_regset32(&p, &vc4_crtc->regset);
+       }
 
        vc4_crtc_pixelvalve_reset(crtc);
 
@@ -359,30 +367,20 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
                   PV_CONTROL_WAIT_HSTART |
                   VC4_SET_FIELD(vc4_encoder->clock_select,
                                 PV_CONTROL_CLK_SELECT));
-}
-
-static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
-{
-       struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-       bool debug_dump_regs = false;
 
        if (debug_dump_regs) {
                struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
-               dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs before:\n",
+               dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs after:\n",
                         drm_crtc_index(crtc));
                drm_print_regset32(&p, &vc4_crtc->regset);
        }
+}
 
+static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
+{
        vc4_crtc_config_pv(crtc);
 
        vc4_hvs_mode_set_nofb(crtc);
-
-       if (debug_dump_regs) {
-               struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
-               dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs after:\n",
-                        drm_crtc_index(crtc));
-               drm_print_regset32(&p, &vc4_crtc->regset);
-       }
 }
 
 static void require_hvs_enabled(struct drm_device *dev)