[Intel-gfx] [PATCH 1/2] drm/i915/lrc: move lrc_get_runtime() to intel_lrc.c

[Tvrtko Ursulin]

On 14/02/2022 17:38, Jani Nikula wrote:
> Move the static inline next to the only caller.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko

> ---
>   drivers/gpu/drm/i915/gt/intel_context_sseu.c |  1 +
>   drivers/gpu/drm/i915/gt/intel_lrc.c          | 11 +++++++++++
>   drivers/gpu/drm/i915/gt/intel_lrc.h          | 11 -----------
>   drivers/gpu/drm/i915/i915_perf.c             |  1 +
>   4 files changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_context_sseu.c b/drivers/gpu/drm/i915/gt/intel_context_sseu.c
> index e86d8255feec..ece16c2b5b8e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context_sseu.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context_sseu.c
> @@ -9,6 +9,7 @@
>   #include "intel_engine_pm.h"
>   #include "intel_gpu_commands.h"
>   #include "intel_lrc.h"
> +#include "intel_lrc_reg.h"
>   #include "intel_ring.h"
>   #include "intel_sseu.h"
>   
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 8189bc8a16ec..5b107b698b65 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1720,6 +1720,17 @@ static void st_update_runtime_underflow(struct intel_context *ce, s32 dt)
>   #endif
>   }
>   
> +static u32 lrc_get_runtime(const struct intel_context *ce)
> +{
> +	/*
> +	 * We can use either ppHWSP[16] which is recorded before the context
> +	 * switch (and so excludes the cost of context switches) or use the
> +	 * value from the context image itself, which is saved/restored earlier
> +	 * and so includes the cost of the save.
> +	 */
> +	return READ_ONCE(ce->lrc_reg_state[CTX_TIMESTAMP]);
> +}
> +
>   void lrc_update_runtime(struct intel_context *ce)
>   {
>   	u32 old;
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.h b/drivers/gpu/drm/i915/gt/intel_lrc.h
> index 7f697845c4cf..2af85a15a370 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.h
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.h
> @@ -9,7 +9,6 @@
>   #include <linux/types.h>
>   
>   #include "intel_context.h"
> -#include "intel_lrc_reg.h"
>   
>   struct drm_i915_gem_object;
>   struct intel_engine_cs;
> @@ -68,15 +67,5 @@ void lrc_check_regs(const struct intel_context *ce,
>   		    const char *when);
>   
>   void lrc_update_runtime(struct intel_context *ce);
> -static inline u32 lrc_get_runtime(const struct intel_context *ce)
> -{
> -	/*
> -	 * We can use either ppHWSP[16] which is recorded before the context
> -	 * switch (and so excludes the cost of context switches) or use the
> -	 * value from the context image itself, which is saved/restored earlier
> -	 * and so includes the cost of the save.
> -	 */
> -	return READ_ONCE(ce->lrc_reg_state[CTX_TIMESTAMP]);
> -}
>   
>   #endif /* __INTEL_LRC_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 36f1325baa7d..00fb40029f43 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -206,6 +206,7 @@
>   #include "gt/intel_gt_clock_utils.h"
>   #include "gt/intel_gt_regs.h"
>   #include "gt/intel_lrc.h"
> +#include "gt/intel_lrc_reg.h"
>   #include "gt/intel_ring.h"
>   
>   #include "i915_drv.h"