Skip to content

Commit 94a438a

Browse files
committed
drm/i915: remove i915_report_error()
i915_report_error() presently acts as a wrapper for __i915_printk(). In practice, it would be better to use drm level error reporting wherever possible, so replace all uses of i915_report_error() with the equivalent drm_err() call. These cases are not worth having a dedicated wrapper to also print bug reporting info. Replacing the calls leaves i915_report_error() with no users, so remove it. Reviewed-by: Tvrtko Ursulin <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Reviewed-by: Jonathan Cavitt <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/19eab020c57c0fa45acacf4e4a8077e57cd4d561.1722951405.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent b635066 commit 94a438a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
451451
if (HAS_PPGTT(dev_priv)) {
452452
if (intel_vgpu_active(dev_priv) &&
453453
!intel_vgpu_has_full_ppgtt(dev_priv)) {
454-
i915_report_error(dev_priv,
455-
"incompatible vGPU found, support for isolated ppGTT required\n");
454+
drm_err(&dev_priv->drm,
455+
"incompatible vGPU found, support for isolated ppGTT required\n");
456456
return -ENXIO;
457457
}
458458
}
@@ -465,8 +465,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
465465
*/
466466
if (intel_vgpu_active(dev_priv) &&
467467
!intel_vgpu_has_hwsp_emulation(dev_priv)) {
468-
i915_report_error(dev_priv,
469-
"old vGPU host found, support for HWSP emulation required\n");
468+
drm_err(&dev_priv->drm,
469+
"old vGPU host found, support for HWSP emulation required\n");
470470
return -ENXIO;
471471
}
472472
}

drivers/gpu/drm/i915/i915_utils.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ void __printf(3, 4)
4949
__i915_printk(struct drm_i915_private *dev_priv, const char *level,
5050
const char *fmt, ...);
5151

52-
#define i915_report_error(dev_priv, fmt, ...) \
53-
__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
54-
5552
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
5653

5754
int __i915_inject_probe_error(struct drm_i915_private *i915, int err,

0 commit comments

Comments
 (0)