Commit 7f67deeb authored by Michał Winiarski's avatar Michał Winiarski Committed by Chris Wilson
Browse files

drm/i915/uc: Extract uc usage details into separate debugfs 



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: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200708100843.297655-1-michal@hardline.pl
parent 018532e9

drivers/gpu/drm/i915/gt/uc/intel_guc.c

+7 −16
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c

+29 −0
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE