提交 1a6c83ef 编写于 作者: W Wambui Karuga 提交者: Jani Nikula

drm/i915/gt: convert to new logging macros in gt/intel_gt.c

Convert remaining instances of the printk based logging macros in
i915/gt/intel_gt to the struct drm_device based logging macros.
Signed-off-by: NWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: NJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128071437.9284-7-wambui.karugax@gmail.com
上级 ce016437
...@@ -198,16 +198,16 @@ static void gen6_check_faults(struct intel_gt *gt) ...@@ -198,16 +198,16 @@ static void gen6_check_faults(struct intel_gt *gt)
for_each_engine(engine, gt, id) { for_each_engine(engine, gt, id) {
fault = GEN6_RING_FAULT_REG_READ(engine); fault = GEN6_RING_FAULT_REG_READ(engine);
if (fault & RING_FAULT_VALID) { if (fault & RING_FAULT_VALID) {
DRM_DEBUG_DRIVER("Unexpected fault\n" drm_dbg(&engine->i915->drm, "Unexpected fault\n"
"\tAddr: 0x%08lx\n" "\tAddr: 0x%08lx\n"
"\tAddress space: %s\n" "\tAddress space: %s\n"
"\tSource ID: %d\n" "\tSource ID: %d\n"
"\tType: %d\n", "\tType: %d\n",
fault & PAGE_MASK, fault & PAGE_MASK,
fault & RING_FAULT_GTTSEL_MASK ? fault & RING_FAULT_GTTSEL_MASK ?
"GGTT" : "PPGTT", "GGTT" : "PPGTT",
RING_FAULT_SRCID(fault), RING_FAULT_SRCID(fault),
RING_FAULT_FAULT_TYPE(fault)); RING_FAULT_FAULT_TYPE(fault));
} }
} }
} }
...@@ -239,18 +239,17 @@ static void gen8_check_faults(struct intel_gt *gt) ...@@ -239,18 +239,17 @@ static void gen8_check_faults(struct intel_gt *gt)
fault_addr = ((u64)(fault_data1 & FAULT_VA_HIGH_BITS) << 44) | fault_addr = ((u64)(fault_data1 & FAULT_VA_HIGH_BITS) << 44) |
((u64)fault_data0 << 12); ((u64)fault_data0 << 12);
DRM_DEBUG_DRIVER("Unexpected fault\n" drm_dbg(&uncore->i915->drm, "Unexpected fault\n"
"\tAddr: 0x%08x_%08x\n" "\tAddr: 0x%08x_%08x\n"
"\tAddress space: %s\n" "\tAddress space: %s\n"
"\tEngine ID: %d\n" "\tEngine ID: %d\n"
"\tSource ID: %d\n" "\tSource ID: %d\n"
"\tType: %d\n", "\tType: %d\n",
upper_32_bits(fault_addr), upper_32_bits(fault_addr), lower_32_bits(fault_addr),
lower_32_bits(fault_addr), fault_data1 & FAULT_GTT_SEL ? "GGTT" : "PPGTT",
fault_data1 & FAULT_GTT_SEL ? "GGTT" : "PPGTT", GEN8_RING_FAULT_ENGINE_ID(fault),
GEN8_RING_FAULT_ENGINE_ID(fault), RING_FAULT_SRCID(fault),
RING_FAULT_SRCID(fault), RING_FAULT_FAULT_TYPE(fault));
RING_FAULT_FAULT_TYPE(fault));
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册