diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-12-15 23:33:31 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 19:46:17 +0300 |
| commit | 73486d750f56ec612b2e02aa06ceb2171a8c5e93 (patch) | |
| tree | fbe373b111414b2be9703de5801640d5be045cc9 /drivers/gpu | |
| parent | 80166e95679742588bd6c17ede46fa46867739f7 (diff) | |
| download | linux-73486d750f56ec612b2e02aa06ceb2171a8c5e93.tar.xz | |
drm/xe/display: Fix dummy __i915_inject_probe_error()
When CONFIG_DRM_I915_DEBUG is not set, a dummy
__i915_inject_probe_error() is provided on the xe side. Use the same
logic as in drivers/gpu/drm/i915/i915_utils.c to ifdef it out. This
fixes the build with W=1 and without that config:
CC [M] drivers/gpu/drm/xe/display/ext/i915_utils.o
../drivers/gpu/drm/xe/display/ext/i915_utils.c:19:5: error: no previous prototype for ‘__i915_inject_probe_error’ [-Werror=missing-prototypes]
19 | int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/xe/display/ext/i915_utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/xe/display/ext/i915_utils.c b/drivers/gpu/drm/xe/display/ext/i915_utils.c index 981edc2788bc..43b10a2cc508 100644 --- a/drivers/gpu/drm/xe/display/ext/i915_utils.c +++ b/drivers/gpu/drm/xe/display/ext/i915_utils.c @@ -14,9 +14,13 @@ bool i915_vtd_active(struct drm_i915_private *i915) return i915_run_as_guest(); } +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG) + /* i915 specific, just put here for shutting it up */ int __i915_inject_probe_error(struct drm_i915_private *i915, int err, const char *func, int line) { return 0; } + +#endif |