]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/workarounds: convert to drm_device based logging macros.
authorWambui Karuga <wambui.karugax@gmail.com>
Sat, 14 Mar 2020 18:33:44 +0000 (21:33 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 19 Mar 2020 09:34:36 +0000 (11:34 +0200)
Replace the use of printk based drm logging macros with the struct
drm_device based logging macros.

Note that this converts DRM_DEBUG_DRIVER() to drm_dbg().

References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200314183344.17603-8-wambui.karugax@gmail.com
drivers/gpu/drm/i915/gt/intel_workarounds.c

index 5176ad1a3976ba393471d343b3c11df00094d001..e96cc7fa09363aafbab6d9ecdb3a28f21a12da31 100644 (file)
@@ -837,7 +837,7 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)
                        intel_uncore_read(&i915->uncore, GEN10_MIRROR_FUSE3) &
                        GEN10_L3BANK_MASK;
 
-               DRM_DEBUG_DRIVER("L3 fuse = %x\n", l3_fuse);
+               drm_dbg(&i915->drm, "L3 fuse = %x\n", l3_fuse);
                l3_en = ~(l3_fuse << GEN10_L3BANK_PAIR_COUNT | l3_fuse);
        } else {
                l3_en = ~0;
@@ -846,7 +846,8 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)
        slice = fls(sseu->slice_mask) - 1;
        subslice = fls(l3_en & intel_sseu_get_subslices(sseu, slice));
        if (!subslice) {
-               DRM_WARN("No common index found between subslice mask %x and L3 bank mask %x!\n",
+               drm_warn(&i915->drm,
+                        "No common index found between subslice mask %x and L3 bank mask %x!\n",
                         intel_sseu_get_subslices(sseu, slice), l3_en);
                subslice = fls(l3_en);
                drm_WARN_ON(&i915->drm, !subslice);
@@ -861,7 +862,7 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)
                mcr_mask = GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK;
        }
 
-       DRM_DEBUG_DRIVER("MCR slice/subslice = %x\n", mcr);
+       drm_dbg(&i915->drm, "MCR slice/subslice = %x\n", mcr);
 
        wa_write_masked_or(wal, GEN8_MCR_SELECTOR, mcr_mask, mcr);
 }