Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: francois.dugast@intel.com, intel-xe@lists.freedesktop.org
Subject: Re: [PATCH] drm/xe/display: Fix dummy __i915_inject_probe_error()
Date: Fri, 15 Dec 2023 15:38:26 -0500	[thread overview]
Message-ID: <ZXy5QkX8EE-wLO-p@intel.com> (raw)
In-Reply-To: <20231215203331.3297341-1-lucas.demarchi@intel.com>

On Fri, Dec 15, 2023 at 12:33:31PM -0800, Lucas De Marchi wrote:
> 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>

> ---
>  drivers/gpu/drm/xe/display/ext/i915_utils.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> 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
> -- 
> 2.40.1
> 

  reply	other threads:[~2023-12-15 20:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-15 20:33 [PATCH] drm/xe/display: Fix dummy __i915_inject_probe_error() Lucas De Marchi
2023-12-15 20:38 ` Rodrigo Vivi [this message]
2023-12-15 20:57 ` ✓ CI.Patch_applied: success for " Patchwork
2023-12-15 20:57 ` ✗ CI.checkpatch: warning " Patchwork
2023-12-15 20:58 ` ✓ CI.KUnit: success " Patchwork
2023-12-15 21:06 ` ✓ CI.Build: " Patchwork
2023-12-15 21:06 ` ✓ CI.Hooks: " Patchwork
2023-12-15 21:08 ` ✓ CI.checksparse: " Patchwork
2023-12-15 21:38 ` ✓ CI.BAT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZXy5QkX8EE-wLO-p@intel.com \
    --to=rodrigo.vivi@intel.com \
    --cc=francois.dugast@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=lucas.demarchi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox