TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: remove i915_report_error()

Browse Source 
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>
This commit is contained in:
Jani Nikula
2024-08-06 16:38:31 +03:00
parent b635066c2e
commit 94a438a759
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/i915/i915_driver.c
+4 -4
View File
@@ -451,8 +451,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
if (HAS_PPGTT(dev_priv)) { if (HAS_PPGTT(dev_priv)) {
if (intel_vgpu_active(dev_priv) && if (intel_vgpu_active(dev_priv) &&
!intel_vgpu_has_full_ppgtt(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"); "incompatible vGPU found, support for isolated ppGTT required\n");
return -ENXIO; return -ENXIO;
} }
} }
@@ -465,8 +465,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
*/ */
if (intel_vgpu_active(dev_priv) && if (intel_vgpu_active(dev_priv) &&
!intel_vgpu_has_hwsp_emulation(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"); "old vGPU host found, support for HWSP emulation required\n");
return -ENXIO; return -ENXIO;
} }
} }
drivers/gpu/drm/i915/i915_utils.h
-3
View File
@@ -49,9 +49,6 @@ void __printf(3, 4)
__i915_printk(struct drm_i915_private *dev_priv, const char *level, __i915_printk(struct drm_i915_private *dev_priv, const char *level,
const char *fmt, ...); 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) #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
int __i915_inject_probe_error(struct drm_i915_private *i915, int err, int __i915_inject_probe_error(struct drm_i915_private *i915, int err,