Commit 94a438a7 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/19eab020c57c0fa45acacf4e4a8077e57cd4d561.1722951405.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b635066c

drivers/gpu/drm/i915/i915_driver.c

+4 −4
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) 
	if (HAS_PPGTT(dev_priv)) {

		if (intel_vgpu_active(dev_priv) &&

		    !intel_vgpu_has_full_ppgtt(dev_priv)) {

			i915_report_error(dev_priv,

			drm_err(&dev_priv->drm,

				"incompatible vGPU found, support for isolated ppGTT required\n");

			return -ENXIO;

		}
@@ -465,7 +465,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) 
		 */

		if (intel_vgpu_active(dev_priv) &&

		    !intel_vgpu_has_hwsp_emulation(dev_priv)) {

			i915_report_error(dev_priv,

			drm_err(&dev_priv->drm,

				"old vGPU host found, support for HWSP emulation required\n");

			return -ENXIO;

		}

drivers/gpu/drm/i915/i915_utils.h

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ void __printf(3, 4) 
__i915_printk(struct drm_i915_private *dev_priv, const char *level,

	      const char *fmt, ...);



#define i915_report_error(dev_priv, fmt, ...)				   \

	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)



#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)



int __i915_inject_probe_error(struct drm_i915_private *i915, int err,