Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8027DC10DCE for ; Fri, 6 Mar 2020 20:52:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 57F82206D7 for ; Fri, 6 Mar 2020 20:52:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57F82206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9C976E4FF; Fri, 6 Mar 2020 20:52:34 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19AEF6E4FF for ; Fri, 6 Mar 2020 20:52:34 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2020 12:52:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,523,1574150400"; d="scan'208";a="288070744" Received: from dceraolo-linux.fm.intel.com (HELO [10.1.27.145]) ([10.1.27.145]) by FMSMGA003.fm.intel.com with ESMTP; 06 Mar 2020 12:52:33 -0800 To: Andi Shyti , Intel GFX References: <20200306200636.52051-1-andi@etezian.org> From: Daniele Ceraolo Spurio Message-ID: <6eaad5cb-a460-b317-b7b2-6abf5c42d075@intel.com> Date: Fri, 6 Mar 2020 12:51:56 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200306200636.52051-1-andi@etezian.org> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/gt: allow setting generic data pointer X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 3/6/20 12:06 PM, Andi Shyti wrote: > From: Andi Shyti > > When registering debugfs files the intel gt debugfs library > forces a 'struct *gt' private data on the caller. > > There might be different needs, therefore make it generic by > adding one more argument to the "debugfs_register_files()" > function which gets the generic void private data as argument. > > Still keep it simple by defining a wrapper where struct *gt is > the chosen private data to be stored. > > I take the chance to rename the functions by using "intel_gt_" as > prefix instead of "debugfs_". > > Signed-off-by: Andi Shyti > --- > Changelog: > v2: > - the eval function is made generic as suggested by Daniele. > > drivers/gpu/drm/i915/gt/debugfs_engines.c | 2 +- > drivers/gpu/drm/i915/gt/debugfs_gt.c | 11 +++++------ > drivers/gpu/drm/i915/gt/debugfs_gt.h | 12 +++++++----- > drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 14 +++++++++----- > 4 files changed, 22 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/debugfs_engines.c b/drivers/gpu/drm/i915/gt/debugfs_engines.c > index 6a5e9ab20b94..3434df10d58c 100644 > --- a/drivers/gpu/drm/i915/gt/debugfs_engines.c > +++ b/drivers/gpu/drm/i915/gt/debugfs_engines.c > @@ -32,5 +32,5 @@ void debugfs_engines_register(struct intel_gt *gt, struct dentry *root) > { "engines", &engines_fops }, > }; > > - debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files)); > + intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files)); > } > diff --git a/drivers/gpu/drm/i915/gt/debugfs_gt.c b/drivers/gpu/drm/i915/gt/debugfs_gt.c > index 75255aaacaed..24099fb157be 100644 > --- a/drivers/gpu/drm/i915/gt/debugfs_gt.c > +++ b/drivers/gpu/drm/i915/gt/debugfs_gt.c > @@ -26,15 +26,14 @@ void debugfs_gt_register(struct intel_gt *gt) > debugfs_gt_pm_register(gt, root); > } > > -void debugfs_gt_register_files(struct intel_gt *gt, > - struct dentry *root, > - const struct debugfs_gt_file *files, > - unsigned long count) > +void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root, The gt variable is now unused in this function, so you can get rid of it, which means you can also drop the macro wrapper you have defined below. > + const struct debugfs_gt_file *files, > + unsigned long count, void *data) > { > while (count--) { > - if (!files->eval || files->eval(gt)) > + if (!files->eval || files->eval(data)) > debugfs_create_file(files->name, > - 0444, root, gt, > + 0444, root, data, > files->fops); > > files++; > diff --git a/drivers/gpu/drm/i915/gt/debugfs_gt.h b/drivers/gpu/drm/i915/gt/debugfs_gt.h > index 4ea0f06cda8f..f498fe75c79a 100644 > --- a/drivers/gpu/drm/i915/gt/debugfs_gt.h > +++ b/drivers/gpu/drm/i915/gt/debugfs_gt.h > @@ -28,12 +28,14 @@ void debugfs_gt_register(struct intel_gt *gt); > struct debugfs_gt_file { > const char *name; > const struct file_operations *fops; > - bool (*eval)(const struct intel_gt *gt); > + bool (*eval)(void *data); > }; > > -void debugfs_gt_register_files(struct intel_gt *gt, > - struct dentry *root, > - const struct debugfs_gt_file *files, > - unsigned long count); > +void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root, > + const struct debugfs_gt_file *files, > + unsigned long count, void *data); > + > +#define intel_gt_debugfs_register_file(g, r, f, c) \ > + __intel_gt_debugfs_register_files(g, r, f, c, g) > > #endif /* DEBUGFS_GT_H */ > diff --git a/drivers/gpu/drm/i915/gt/debugfs_gt_pm.c b/drivers/gpu/drm/i915/gt/debugfs_gt_pm.c > index 059c9e5c002e..a233b97a9294 100644 > --- a/drivers/gpu/drm/i915/gt/debugfs_gt_pm.c > +++ b/drivers/gpu/drm/i915/gt/debugfs_gt_pm.c > @@ -506,9 +506,11 @@ static int llc_show(struct seq_file *m, void *data) > return 0; > } > > -static bool llc_eval(const struct intel_gt *gt) > +static bool llc_eval(void *data) > { > - return HAS_LLC(gt->i915); > + struct intel_gt *gt = data; > + > + return !gt ? false : HAS_LLC(gt->i915); Is there a case where gt can be NULL? BTW, you can also have this condition as: return gt && HAS_LLC(gt->i915); Daniele > } > > DEFINE_GT_DEBUGFS_ATTRIBUTE(llc); > @@ -580,9 +582,11 @@ static int rps_boost_show(struct seq_file *m, void *data) > return 0; > } > > -static bool rps_eval(const struct intel_gt *gt) > +static bool rps_eval(void *data) > { > - return HAS_RPS(gt->i915); > + struct intel_gt *gt = data; > + > + return !gt ? false : HAS_RPS(gt->i915); > } > > DEFINE_GT_DEBUGFS_ATTRIBUTE(rps_boost); > @@ -597,5 +601,5 @@ void debugfs_gt_pm_register(struct intel_gt *gt, struct dentry *root) > { "rps_boost", &rps_boost_fops, rps_eval }, > }; > > - debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files)); > + intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files)); > } > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx