@@ -290,6 +290,14 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
290
290
vc4_encoder -> type == VC4_ENCODER_TYPE_DSI1 );
291
291
u32 format = is_dsi ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24 ;
292
292
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
+ }
293
301
294
302
vc4_crtc_pixelvalve_reset (crtc );
295
303
@@ -359,30 +367,20 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
359
367
PV_CONTROL_WAIT_HSTART |
360
368
VC4_SET_FIELD (vc4_encoder -> clock_select ,
361
369
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;
368
370
369
371
if (debug_dump_regs ) {
370
372
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" ,
372
374
drm_crtc_index (crtc ));
373
375
drm_print_regset32 (& p , & vc4_crtc -> regset );
374
376
}
377
+ }
375
378
379
+ static void vc4_crtc_mode_set_nofb (struct drm_crtc * crtc )
380
+ {
376
381
vc4_crtc_config_pv (crtc );
377
382
378
383
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
- }
386
384
}
387
385
388
386
static void require_hvs_enabled (struct drm_device * dev )
0 commit comments