Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bbb0aef5cfe95fe9b51a7eeba4a440b69037b01f

Authored by Joe Perches
Committed by Dave Airlie
1 parent 5ad3d8831f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

drm: Verify debug message arguments 

Add __attribute__((format (printf, 4, 5))) to drm_ut_debug_printk
and fix fallout.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

Showing 5 changed files with 17 additions and 14 deletions Side-by-side Diff

drivers/gpu/drm/drm_irq.c
Diff comments   View file @ bbb0aef
... ... @@ -684,10 +684,11 @@
684 684 */
685 685 *vblank_time = ns_to_timeval(timeval_to_ns(&raw_time) - delta_ns);
686 686  
687   - DRM_DEBUG("crtc %d : v %d p(%d,%d)@ %d.%d -> %d.%d [e %d us, %d rep]\n",
688   - crtc, (int) vbl_status, hpos, vpos, raw_time.tv_sec,
689   - raw_time.tv_usec, vblank_time->tv_sec, vblank_time->tv_usec,
690   - (int) duration_ns/1000, i);
  687 + DRM_DEBUG("crtc %d : v %d p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",
  688 + crtc, (int)vbl_status, hpos, vpos,
  689 + (long)raw_time.tv_sec, (long)raw_time.tv_usec,
  690 + (long)vblank_time->tv_sec, (long)vblank_time->tv_usec,
  691 + (int)duration_ns/1000, i);
691 692  
692 693 vbl_status = DRM_VBLANKTIME_SCANOUTPOS_METHOD;
693 694 if (invbl)
drivers/gpu/drm/i915/intel_bios.c
Diff comments   View file @ bbb0aef
... ... @@ -214,9 +214,9 @@
214 214 i915_lvds_downclock) {
215 215 dev_priv->lvds_downclock_avail = 1;
216 216 dev_priv->lvds_downclock = temp_downclock;
217   - DRM_DEBUG_KMS("LVDS downclock is found in VBT. ",
218   - "Normal Clock %dKHz, downclock %dKHz\n",
219   - temp_downclock, panel_fixed_mode->clock);
  217 + DRM_DEBUG_KMS("LVDS downclock is found in VBT. "
  218 + "Normal Clock %dKHz, downclock %dKHz\n",
  219 + temp_downclock, panel_fixed_mode->clock);
220 220 }
221 221 return;
222 222 }
drivers/gpu/drm/i915/intel_display.c
Diff comments   View file @ bbb0aef
... ... @@ -3497,11 +3497,11 @@
3497 3497 1000;
3498 3498 entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size);
3499 3499  
3500   - DRM_DEBUG_KMS("FIFO entries required for mode: %d\n", entries_required);
  3500 + DRM_DEBUG_KMS("FIFO entries required for mode: %ld\n", entries_required);
3501 3501  
3502 3502 wm_size = fifo_size - (entries_required + wm->guard_size);
3503 3503  
3504   - DRM_DEBUG_KMS("FIFO watermark level: %d\n", wm_size);
  3504 + DRM_DEBUG_KMS("FIFO watermark level: %ld\n", wm_size);
3505 3505  
3506 3506 /* Don't promote wm_size to unsigned... */
3507 3507 if (wm_size > (long)wm->max_wm)
3508 3508  
... ... @@ -3823,13 +3823,13 @@
3823 3823 display_wm, cursor_wm);
3824 3824  
3825 3825 if (display_wm > display->max_wm) {
3826   - DRM_DEBUG_KMS("display watermark is too large(%d), disabling\n",
  3826 + DRM_DEBUG_KMS("display watermark is too large(%d/%ld), disabling\n",
3827 3827 display_wm, display->max_wm);
3828 3828 return false;
3829 3829 }
3830 3830  
3831 3831 if (cursor_wm > cursor->max_wm) {
3832   - DRM_DEBUG_KMS("cursor watermark is too large(%d), disabling\n",
  3832 + DRM_DEBUG_KMS("cursor watermark is too large(%d/%ld), disabling\n",
3833 3833 cursor_wm, cursor->max_wm);
3834 3834 return false;
3835 3835 }
drivers/gpu/drm/radeon/radeon_display.c
Diff comments   View file @ bbb0aef
... ... @@ -1087,8 +1087,9 @@
1087 1087 *frac_fb_div_p = best_frac_feedback_div;
1088 1088 *ref_div_p = best_ref_div;
1089 1089 *post_div_p = best_post_div;
1090   - DRM_DEBUG_KMS("%d %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
1091   - freq, best_freq / 1000, best_feedback_div, best_frac_feedback_div,
  1090 + DRM_DEBUG_KMS("%lld %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
  1091 + (long long)freq,
  1092 + best_freq / 1000, best_feedback_div, best_frac_feedback_div,
1092 1093 best_ref_div, best_post_div);
1093 1094  
1094 1095 }
... ... @@ -122,7 +122,8 @@
122 122 * using the DRM_DEBUG_KMS and DRM_DEBUG.
123 123 */
124 124  
125   -extern void drm_ut_debug_printk(unsigned int request_level,
  125 +extern __attribute__((format (printf, 4, 5)))
  126 +void drm_ut_debug_printk(unsigned int request_level,
126 127 const char *prefix,
127 128 const char *function_name,
128 129 const char *format, ...);