Skip to content

Commit be26296

Browse files
committed
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 <[email protected]> Tested-by: Chanwoo Choi <[email protected]> Tested-by: Hoegeun Kwon <[email protected]> Tested-by: Stefan Wahren <[email protected]> Reviewed-by: Dave Stevenson <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/c195af7d9e140a2a6db32992ee7e54071c6f94ba.1599120059.git-series.maxime@cerno.tech
1 parent 5ffabf5 commit be26296

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

drivers/gpu/drm/vc4/vc4_crtc.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,14 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
290290
vc4_encoder->type == VC4_ENCODER_TYPE_DSI1);
291291
u32 format = is_dsi ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
292292
u8 ppc = pv_data->pixels_per_clock;
293+
bool debug_dump_regs = false;
294+
295+
if (debug_dump_regs) {
296+
struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
297+
dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs before:\n",
298+
drm_crtc_index(crtc));
299+
drm_print_regset32(&p, &vc4_crtc->regset);
300+
}
293301

294302
vc4_crtc_pixelvalve_reset(crtc);
295303

@@ -359,30 +367,20 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
359367
PV_CONTROL_WAIT_HSTART |
360368
VC4_SET_FIELD(vc4_encoder->clock_select,
361369
PV_CONTROL_CLK_SELECT));
362-
}
363-
364-
static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
365-
{
366-
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
367-
bool debug_dump_regs = false;
368370

369371
if (debug_dump_regs) {
370372
struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
371-
dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs before:\n",
373+
dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs after:\n",
372374
drm_crtc_index(crtc));
373375
drm_print_regset32(&p, &vc4_crtc->regset);
374376
}
377+
}
375378

379+
static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
380+
{
376381
vc4_crtc_config_pv(crtc);
377382

378383
vc4_hvs_mode_set_nofb(crtc);
379-
380-
if (debug_dump_regs) {
381-
struct drm_printer p = drm_info_printer(&vc4_crtc->pdev->dev);
382-
dev_info(&vc4_crtc->pdev->dev, "CRTC %d regs after:\n",
383-
drm_crtc_index(crtc));
384-
drm_print_regset32(&p, &vc4_crtc->regset);
385-
}
386384
}
387385

388386
static void require_hvs_enabled(struct drm_device *dev)

0 commit comments

Comments
 (0)