[Intel-gfx] [PATCH 1/2] drm/i915/uc: Extract uc usage details into separate debugfs

[Daniele Ceraolo Spurio]

On 7/7/2020 2:52 PM, Michał Winiarski wrote:
> From: Michał Winiarski <michal.winiarski at intel.com>
>
> It has been pointed out that information about HuC usage doesn't belong
> in guc_info debugfs. Let's move "supported/used/wanted" matrix to a
> separate debugfs file, keeping guc_info strictly about GuC.
>
> Suggested-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Lukasz Fiedorowicz <lukasz.fiedorowicz at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

Daniele

> ---
>   drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 23 +++++----------
>   drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 29 +++++++++++++++++++
>   2 files changed, 36 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index 446a41946f56..861657897c0f 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -733,28 +733,19 @@ int intel_guc_allocate_and_map_vma(struct intel_guc *guc, u32 size,
>    */
>   void intel_guc_load_status(struct intel_guc *guc, struct drm_printer *p)
>   {
> -	struct intel_uc *uc = container_of(guc, struct intel_uc, guc);
>   	struct intel_gt *gt = guc_to_gt(guc);
>   	struct intel_uncore *uncore = gt->uncore;
>   	intel_wakeref_t wakeref;
>   
> -	drm_printf(p, "[guc] supported:%s wanted:%s used:%s\n",
> -		   yesno(intel_uc_supports_guc(uc)),
> -		   yesno(intel_uc_wants_guc(uc)),
> -		   yesno(intel_uc_uses_guc(uc)));
> -	drm_printf(p, "[huc] supported:%s wanted:%s used:%s\n",
> -		   yesno(intel_uc_supports_huc(uc)),
> -		   yesno(intel_uc_wants_huc(uc)),
> -		   yesno(intel_uc_uses_huc(uc)));
> -	drm_printf(p, "[submission] supported:%s wanted:%s used:%s\n",
> -		   yesno(intel_uc_supports_guc_submission(uc)),
> -		   yesno(intel_uc_wants_guc_submission(uc)),
> -		   yesno(intel_uc_uses_guc_submission(uc)));
> -
> -	if (!intel_guc_is_supported(guc) || !intel_guc_is_wanted(guc))
> +	if (!intel_guc_is_supported(guc)) {
> +		drm_printf(p, "GuC not supported\n");
>   		return;
> +	}
>   
> -	drm_puts(p, "\n");
> +	if (!intel_guc_is_wanted(guc)) {
> +		drm_printf(p, "GuC disabled\n");
> +		return;
> +	}
>   
>   	intel_uc_fw_dump(&guc->fw, p);
>   
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c
> index 9d16b784aa0d..089d98662f46 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c
> @@ -4,14 +4,41 @@
>    */
>   
>   #include <linux/debugfs.h>
> +#include <drm/drm_print.h>
>   
> +#include "gt/debugfs_gt.h"
>   #include "intel_guc_debugfs.h"
>   #include "intel_huc_debugfs.h"
>   #include "intel_uc.h"
>   #include "intel_uc_debugfs.h"
>   
> +static int uc_usage_show(struct seq_file *m, void *data)
> +{
> +	struct intel_uc *uc = m->private;
> +	struct drm_printer p = drm_seq_file_printer(m);
> +
> +	drm_printf(&p, "[guc] supported:%s wanted:%s used:%s\n",
> +		   yesno(intel_uc_supports_guc(uc)),
> +		   yesno(intel_uc_wants_guc(uc)),
> +		   yesno(intel_uc_uses_guc(uc)));
> +	drm_printf(&p, "[huc] supported:%s wanted:%s used:%s\n",
> +		   yesno(intel_uc_supports_huc(uc)),
> +		   yesno(intel_uc_wants_huc(uc)),
> +		   yesno(intel_uc_uses_huc(uc)));
> +	drm_printf(&p, "[submission] supported:%s wanted:%s used:%s\n",
> +		   yesno(intel_uc_supports_guc_submission(uc)),
> +		   yesno(intel_uc_wants_guc_submission(uc)),
> +		   yesno(intel_uc_uses_guc_submission(uc)));
> +
> +	return 0;
> +}
> +DEFINE_GT_DEBUGFS_ATTRIBUTE(uc_usage);
> +
>   void intel_uc_debugfs_register(struct intel_uc *uc, struct dentry *gt_root)
>   {
> +	static const struct debugfs_gt_file files[] = {
> +		{ "usage", &uc_usage_fops, NULL },
> +	};
>   	struct dentry *root;
>   
>   	if (!gt_root)
> @@ -25,6 +52,8 @@ void intel_uc_debugfs_register(struct intel_uc *uc, struct dentry *gt_root)
>   	if (IS_ERR(root))
>   		return;
>   
> +	intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), uc);
> +
>   	intel_guc_debugfs_register(&uc->guc, root);
>   	intel_huc_debugfs_register(&uc->huc, root);
>   }