[PATCH 2/3] drm/i915: remove i915_report_error()

[Tvrtko Ursulin]

On 06/08/2024 14:38, Jani Nikula wrote:
> i915_report_error() has only two users, both in driver probe. I doubt
> these cases are worth having a dedicated wrapper to also print bug
> reporting info. Just switch them to regular drm_err() and remove the
> wrapper.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_driver.c | 8 ++++----
>   drivers/gpu/drm/i915/i915_utils.h  | 3 ---
>   2 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index fb8e9c2fcea5..94dca1d8bb15 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -451,8 +451,8 @@ 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,
> -					  "incompatible vGPU found, support for isolated ppGTT required\n");
> +			drm_err(&dev_priv->drm,
> +				"incompatible vGPU found, support for isolated ppGTT required\n");
>   			return -ENXIO;
>   		}
>   	}
> @@ -465,8 +465,8 @@ 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,
> -					  "old vGPU host found, support for HWSP emulation required\n");
> +			drm_err(&dev_priv->drm,
> +				"old vGPU host found, support for HWSP emulation required\n");
>   			return -ENXIO;
>   		}
>   	}
> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
> index 06ec6ceb61d5..feb078ae246f 100644
> --- a/drivers/gpu/drm/i915/i915_utils.h
> +++ b/drivers/gpu/drm/i915/i915_utils.h
> @@ -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,

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>

Regards,

Tvrtko