Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <tvrtko.ursulin@igalia.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/19eab020c57c0fa45acacf4e4a8077e57cd4d561.1722951405.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+4 -7
+4 -4
drivers/gpu/drm/i915/i915_driver.c
··· 451 451 if (HAS_PPGTT(dev_priv)) { 452 452 if (intel_vgpu_active(dev_priv) && 453 453 !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"); 456 456 return -ENXIO; 457 457 } 458 458 } ··· 465 465 */ 466 466 if (intel_vgpu_active(dev_priv) && 467 467 !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"); 470 470 return -ENXIO; 471 471 } 472 472 }
-3
drivers/gpu/drm/i915/i915_utils.h
··· 49 49 __i915_printk(struct drm_i915_private *dev_priv, const char *level, 50 50 const char *fmt, ...); 51 51 52 - #define i915_report_error(dev_priv, fmt, ...) \ 53 - __i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__) 54 - 55 52 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG) 56 53 57 54 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,