]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/xe/display: Fix dummy __i915_inject_probe_error()
authorLucas De Marchi <lucas.demarchi@intel.com>
Fri, 15 Dec 2023 20:33:31 +0000 (12:33 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 21 Dec 2023 16:46:17 +0000 (11:46 -0500)
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>
drivers/gpu/drm/xe/display/ext/i915_utils.c

index 981edc2788bc3af47df96e3dd76ecc7121064805..43b10a2cc5085d8dc11b275e6bc2891bbf90ee3b 100644 (file)
@@ -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