On Mon, Aug 23, 2021 at 09:31:37AM -0700, Daniele Ceraolo Spurio wrote:
> The function is only used from within GEM_BUG_ON(), which is causing
> warnings with Wunneeded-internal-declaration in some builds. Since the
> function is a simple wrapper around a CT function, we can just call the
> CT function directly instead.
>
> Fixes: 1fb12c587152 ("drm/i915/guc: skip disabling CTBs before sanitizing the
> GuC")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Daniele Ceraolo Spurio <[email protected]>
Reviewed-by: Matthew Brost <[email protected]>
> Cc: Matthew Brost <[email protected]>
> Cc: John Harrison <[email protected]>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_uc.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> index b104fb7607eb..86c318516e14 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
> @@ -172,11 +172,6 @@ void intel_uc_driver_remove(struct intel_uc *uc)
> __uc_free_load_err_log(uc);
> }
>
> -static inline bool guc_communication_enabled(struct intel_guc *guc)
> -{
> - return intel_guc_ct_enabled(&guc->ct);
> -}
> -
> /*
> * Events triggered while CT buffers are disabled are logged in the
> SCRATCH_15
> * register using the same bits used in the CT message payload. Since our
> @@ -210,7 +205,7 @@ static void guc_get_mmio_msg(struct intel_guc *guc)
> static void guc_handle_mmio_msg(struct intel_guc *guc)
> {
> /* we need communication to be enabled to reply to GuC */
> - GEM_BUG_ON(!guc_communication_enabled(guc));
> + GEM_BUG_ON(!intel_guc_ct_enabled(&guc->ct));
>
> spin_lock_irq(&guc->irq_lock);
> if (guc->mmio_msg) {
> @@ -226,7 +221,7 @@ static int guc_enable_communication(struct intel_guc *guc)
> struct drm_i915_private *i915 = gt->i915;
> int ret;
>
> - GEM_BUG_ON(guc_communication_enabled(guc));
> + GEM_BUG_ON(intel_guc_ct_enabled(&guc->ct));
>
> ret = i915_inject_probe_error(i915, -ENXIO);
> if (ret)
> @@ -662,7 +657,7 @@ static int __uc_resume(struct intel_uc *uc, bool
> enable_communication)
> return 0;
>
> /* Make sure we enable communication if and only if it's disabled */
> - GEM_BUG_ON(enable_communication == guc_communication_enabled(guc));
> + GEM_BUG_ON(enable_communication == intel_guc_ct_enabled(&guc->ct));
>
> if (enable_communication)
> guc_enable_communication(guc);
> --
> 2.33.0
>
