Message ID | 20210721161120.24610-10-vinay.belgaumkar@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915/guc: Enable GuC based power management features | expand |
On 21.07.2021 18:11, Vinay Belgaumkar wrote: > This prints out relevant SLPC info from the SLPC shared structure. > > We will send a h2g message which forces SLPC to update the > shared data structure with latest information before reading it. > > v2: Address review comments (Michal W) > > Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com> > Signed-off-by: Sundaresan Sujaritha <sujaritha.sundaresan@intel.com> > --- > .../gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 23 +++++++++++ > drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 40 +++++++++++++++++++ > drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 4 +- > 3 files changed, 66 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c > index 72ddfff42f7d..46b22187927b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c > @@ -12,6 +12,7 @@ > #include "gt/uc/intel_guc_ct.h" > #include "gt/uc/intel_guc_ads.h" > #include "gt/uc/intel_guc_submission.h" > +#include "gt/uc/intel_guc_slpc.h" > > static int guc_info_show(struct seq_file *m, void *data) > { > @@ -50,11 +51,33 @@ static int guc_registered_contexts_show(struct seq_file *m, void *data) > } > DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_registered_contexts); > > +static int guc_slpc_info_show(struct seq_file *m, void *unused) > +{ > + struct intel_guc *guc = m->private; > + struct intel_guc_slpc *slpc = &guc->slpc; > + struct drm_printer p = drm_seq_file_printer(m); > + > + if (!intel_guc_slpc_is_used(guc)) > + return -ENODEV; > + > + return intel_guc_slpc_info(slpc, &p); > +} > +DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_slpc_info); > + > +bool intel_eval_slpc_support(void *data) > +{ > + struct intel_guc *guc; > + > + guc = (struct intel_guc *)data; struct intel_guc *guc = (struct intel_guc *)data; > + return intel_guc_slpc_is_used(guc); > +} > + > void intel_guc_debugfs_register(struct intel_guc *guc, struct dentry *root) > { > static const struct debugfs_gt_file files[] = { > { "guc_info", &guc_info_fops, NULL }, > { "guc_registered_contexts", &guc_registered_contexts_fops, NULL }, > + { "guc_slpc_info", &guc_slpc_info_fops, &intel_eval_slpc_support}, > }; > > if (!intel_guc_is_supported(guc)) > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > index c1cf8d46e360..73379985c105 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c > @@ -430,6 +430,46 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc) > return 0; > } > > +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p) > +{ > + struct drm_i915_private *i915 = guc_to_gt(slpc_to_guc(slpc))->i915; > + struct slpc_shared_data *data; > + struct slpc_task_state_data *slpc_tasks; > + intel_wakeref_t wakeref; > + int ret = 0; > + > + with_intel_runtime_pm(&i915->runtime_pm, wakeref) { > + if (slpc_query_task_state(slpc)) > + return -EIO; not sure if you can return directly from "with_rpm" > + > + slpc_tasks = &data->task_state_data; > + > + drm_printf(p, "SLPC state: %s\n", slpc_state_string(slpc)); > + drm_printf(p, "\tgtperf task active: %s\n", > + yesno(slpc_tasks->status & SLPC_GTPERF_TASK_ACTIVE)); > + drm_printf(p, "\tdcc task active: %s\n", > + yesno(slpc_tasks->status & SLPC_DCC_TASK_ACTIVE)); > + drm_printf(p, "\tin dcc: %s\n", > + yesno(slpc_tasks->status & SLPC_IN_DCC)); > + drm_printf(p, "\tfreq switch active: %s\n", > + yesno(slpc_tasks->status & SLPC_FREQ_SWITCH_ACTIVE)); > + drm_printf(p, "\tibc enabled: %s\n", > + yesno(slpc_tasks->status & SLPC_IBC_ENABLED)); > + drm_printf(p, "\tibc active: %s\n", > + yesno(slpc_tasks->status & SLPC_IBC_ACTIVE)); > + drm_printf(p, "\tpg1 enabled: %s\n", > + yesno(slpc_tasks->status & SLPC_PG1_ENABLED)); > + drm_printf(p, "\tpg1 active: %s\n", > + yesno(slpc_tasks->status & SLPC_PG1_ACTIVE)); > + drm_printf(p, "\tmax freq: %dMHz\n", > + slpc_decode_max_freq(slpc)); > + drm_printf(p, "\tmin freq: %dMHz\n", > + slpc_decode_min_freq(slpc)); not sure what they are: DCC ? IBC ? PG1 ? and make sure to use %u for unsigned Michal > + } > + > + return ret; > +} > + > void intel_guc_slpc_fini(struct intel_guc_slpc *slpc) > { > if (!slpc->vma) > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h > index 627c71a95777..852c6316aa47 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h > @@ -10,6 +10,8 @@ > #include "intel_guc_slpc_types.h" > #include "abi/guc_actions_slpc_abi.h" > > +struct drm_printer; > + > static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) > { > return guc->slpc_supported; > @@ -26,7 +28,6 @@ static inline bool intel_guc_slpc_is_used(struct intel_guc *guc) > } > > void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc); > - > int intel_guc_slpc_init(struct intel_guc_slpc *slpc); > int intel_guc_slpc_enable(struct intel_guc_slpc *slpc); > void intel_guc_slpc_fini(struct intel_guc_slpc *slpc); > @@ -34,5 +35,6 @@ int intel_guc_slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 val); > int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val); > int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val); > int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val); > +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p); > > #endif >
Hi Vinay, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on drm-tip/drm-tip] [cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.14-rc2 next-20210721] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-randconfig-a016-20210720 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project c781eb153bfbd1b52b03efe34f56bbeccbb8aba6) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install x86_64 cross compiling tool for clang build # apt-get install binutils-x86-64-linux-gnu # https://github.com/0day-ci/linux/commit/1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528 git checkout 1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All warnings (new ones prefixed by >>): >> drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c:67:6: warning: no previous prototype for function 'intel_eval_slpc_support' [-Wmissing-prototypes] bool intel_eval_slpc_support(void *data) ^ drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c:67:1: note: declare 'static' if the function is not intended to be used outside of this translation unit bool intel_eval_slpc_support(void *data) ^ static 1 warning generated. -- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:238:5: warning: no previous prototype for function 'slpc_decode_min_freq' [-Wmissing-prototypes] u32 slpc_decode_min_freq(struct intel_guc_slpc *slpc) ^ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:238:1: note: declare 'static' if the function is not intended to be used outside of this translation unit u32 slpc_decode_min_freq(struct intel_guc_slpc *slpc) ^ static drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:250:5: warning: no previous prototype for function 'slpc_decode_max_freq' [-Wmissing-prototypes] u32 slpc_decode_max_freq(struct intel_guc_slpc *slpc) ^ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:250:1: note: declare 'static' if the function is not intended to be used outside of this translation unit u32 slpc_decode_max_freq(struct intel_guc_slpc *slpc) ^ static >> drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:445:17: warning: variable 'data' is uninitialized when used here [-Wuninitialized] slpc_tasks = &data->task_state_data; ^~~~ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:436:31: note: initialize the variable 'data' to silence this warning struct slpc_shared_data *data; ^ = NULL 3 warnings generated. vim +/intel_eval_slpc_support +67 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c 66 > 67 bool intel_eval_slpc_support(void *data) 68 { 69 struct intel_guc *guc; 70 71 guc = (struct intel_guc *)data; 72 return intel_guc_slpc_is_used(guc); 73 } 74 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
On 7/21/2021 11:05 AM, Michal Wajdeczko wrote: > > > On 21.07.2021 18:11, Vinay Belgaumkar wrote: >> This prints out relevant SLPC info from the SLPC shared structure. >> >> We will send a h2g message which forces SLPC to update the >> shared data structure with latest information before reading it. >> >> v2: Address review comments (Michal W) >> >> Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com> >> Signed-off-by: Sundaresan Sujaritha <sujaritha.sundaresan@intel.com> >> --- >> .../gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 23 +++++++++++ >> drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 40 +++++++++++++++++++ >> drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 4 +- >> 3 files changed, 66 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c >> index 72ddfff42f7d..46b22187927b 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c >> @@ -12,6 +12,7 @@ >> #include "gt/uc/intel_guc_ct.h" >> #include "gt/uc/intel_guc_ads.h" >> #include "gt/uc/intel_guc_submission.h" >> +#include "gt/uc/intel_guc_slpc.h" >> >> static int guc_info_show(struct seq_file *m, void *data) >> { >> @@ -50,11 +51,33 @@ static int guc_registered_contexts_show(struct seq_file *m, void *data) >> } >> DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_registered_contexts); >> >> +static int guc_slpc_info_show(struct seq_file *m, void *unused) >> +{ >> + struct intel_guc *guc = m->private; >> + struct intel_guc_slpc *slpc = &guc->slpc; >> + struct drm_printer p = drm_seq_file_printer(m); >> + >> + if (!intel_guc_slpc_is_used(guc)) >> + return -ENODEV; >> + >> + return intel_guc_slpc_info(slpc, &p); >> +} >> +DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_slpc_info); >> + >> +bool intel_eval_slpc_support(void *data) >> +{ >> + struct intel_guc *guc; >> + >> + guc = (struct intel_guc *)data; > > struct intel_guc *guc = (struct intel_guc *)data; > >> + return intel_guc_slpc_is_used(guc); >> +} >> + >> void intel_guc_debugfs_register(struct intel_guc *guc, struct dentry *root) >> { >> static const struct debugfs_gt_file files[] = { >> { "guc_info", &guc_info_fops, NULL }, >> { "guc_registered_contexts", &guc_registered_contexts_fops, NULL }, >> + { "guc_slpc_info", &guc_slpc_info_fops, &intel_eval_slpc_support}, >> }; >> >> if (!intel_guc_is_supported(guc)) >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c >> index c1cf8d46e360..73379985c105 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c >> @@ -430,6 +430,46 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc) >> return 0; >> } >> >> +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p) >> +{ >> + struct drm_i915_private *i915 = guc_to_gt(slpc_to_guc(slpc))->i915; >> + struct slpc_shared_data *data; >> + struct slpc_task_state_data *slpc_tasks; >> + intel_wakeref_t wakeref; >> + int ret = 0; >> + >> + with_intel_runtime_pm(&i915->runtime_pm, wakeref) { >> + if (slpc_query_task_state(slpc)) >> + return -EIO; > > not sure if you can return directly from "with_rpm" Good point, checking err instead. > >> + >> + slpc_tasks = &data->task_state_data; >> + >> + drm_printf(p, "SLPC state: %s\n", slpc_state_string(slpc)); >> + drm_printf(p, "\tgtperf task active: %s\n", >> + yesno(slpc_tasks->status & SLPC_GTPERF_TASK_ACTIVE)); >> + drm_printf(p, "\tdcc task active: %s\n", >> + yesno(slpc_tasks->status & SLPC_DCC_TASK_ACTIVE)); >> + drm_printf(p, "\tin dcc: %s\n", >> + yesno(slpc_tasks->status & SLPC_IN_DCC)); >> + drm_printf(p, "\tfreq switch active: %s\n", >> + yesno(slpc_tasks->status & SLPC_FREQ_SWITCH_ACTIVE)); >> + drm_printf(p, "\tibc enabled: %s\n", >> + yesno(slpc_tasks->status & SLPC_IBC_ENABLED)); >> + drm_printf(p, "\tibc active: %s\n", >> + yesno(slpc_tasks->status & SLPC_IBC_ACTIVE)); >> + drm_printf(p, "\tpg1 enabled: %s\n", >> + yesno(slpc_tasks->status & SLPC_PG1_ENABLED)); >> + drm_printf(p, "\tpg1 active: %s\n", >> + yesno(slpc_tasks->status & SLPC_PG1_ACTIVE)); >> + drm_printf(p, "\tmax freq: %dMHz\n", >> + slpc_decode_max_freq(slpc)); >> + drm_printf(p, "\tmin freq: %dMHz\n", >> + slpc_decode_min_freq(slpc)); > > not sure what they are: > > DCC ? > IBC ? > PG1 ? Removed these for now, since we don't use/enable them yet anyways. > > and make sure to use %u for unsigned Ok. Thanks, Vinay. > > Michal > >> + } >> + >> + return ret; >> +} >> + >> void intel_guc_slpc_fini(struct intel_guc_slpc *slpc) >> { >> if (!slpc->vma) >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h >> index 627c71a95777..852c6316aa47 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h >> @@ -10,6 +10,8 @@ >> #include "intel_guc_slpc_types.h" >> #include "abi/guc_actions_slpc_abi.h" >> >> +struct drm_printer; >> + >> static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) >> { >> return guc->slpc_supported; >> @@ -26,7 +28,6 @@ static inline bool intel_guc_slpc_is_used(struct intel_guc *guc) >> } >> >> void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc); >> - >> int intel_guc_slpc_init(struct intel_guc_slpc *slpc); >> int intel_guc_slpc_enable(struct intel_guc_slpc *slpc); >> void intel_guc_slpc_fini(struct intel_guc_slpc *slpc); >> @@ -34,5 +35,6 @@ int intel_guc_slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 val); >> int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val); >> int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val); >> int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val); >> +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p); >> >> #endif >>
Hi Vinay,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.14-rc2 next-20210723]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: x86_64-rhel-8.3-kselftests (attached as .config)
compiler: gcc-10 (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.3-341-g8af24329-dirty
# https://github.com/0day-ci/linux/commit/1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528
git checkout 1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c:67:6: sparse: sparse: symbol 'intel_eval_slpc_support' was not declared. Should it be static?
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Vinay, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on drm-tip/drm-tip] [cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.14-rc2 next-20210723] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3-kselftests (attached as .config) compiler: gcc-10 (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-341-g8af24329-dirty # https://github.com/0day-ci/linux/commit/1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Vinay-Belgaumkar/drm-i915-guc-Enable-GuC-based-power-management-features/20210722-001528 git checkout 1c6f8cf3c2757db7a87fceef08834f4e0e14f2f9 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/ If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> sparse warnings: (new ones prefixed by >>) >> drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c:67:6: sparse: sparse: symbol 'intel_eval_slpc_support' was not declared. Should it be static? vim +/intel_eval_slpc_support +67 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c 66 > 67 bool intel_eval_slpc_support(void *data) 68 { 69 struct intel_guc *guc; 70 71 guc = (struct intel_guc *)data; 72 return intel_guc_slpc_is_used(guc); 73 } 74 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c index 72ddfff42f7d..46b22187927b 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c @@ -12,6 +12,7 @@ #include "gt/uc/intel_guc_ct.h" #include "gt/uc/intel_guc_ads.h" #include "gt/uc/intel_guc_submission.h" +#include "gt/uc/intel_guc_slpc.h" static int guc_info_show(struct seq_file *m, void *data) { @@ -50,11 +51,33 @@ static int guc_registered_contexts_show(struct seq_file *m, void *data) } DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_registered_contexts); +static int guc_slpc_info_show(struct seq_file *m, void *unused) +{ + struct intel_guc *guc = m->private; + struct intel_guc_slpc *slpc = &guc->slpc; + struct drm_printer p = drm_seq_file_printer(m); + + if (!intel_guc_slpc_is_used(guc)) + return -ENODEV; + + return intel_guc_slpc_info(slpc, &p); +} +DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_slpc_info); + +bool intel_eval_slpc_support(void *data) +{ + struct intel_guc *guc; + + guc = (struct intel_guc *)data; + return intel_guc_slpc_is_used(guc); +} + void intel_guc_debugfs_register(struct intel_guc *guc, struct dentry *root) { static const struct debugfs_gt_file files[] = { { "guc_info", &guc_info_fops, NULL }, { "guc_registered_contexts", &guc_registered_contexts_fops, NULL }, + { "guc_slpc_info", &guc_slpc_info_fops, &intel_eval_slpc_support}, }; if (!intel_guc_is_supported(guc)) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c index c1cf8d46e360..73379985c105 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c @@ -430,6 +430,46 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc) return 0; } +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p) +{ + struct drm_i915_private *i915 = guc_to_gt(slpc_to_guc(slpc))->i915; + struct slpc_shared_data *data; + struct slpc_task_state_data *slpc_tasks; + intel_wakeref_t wakeref; + int ret = 0; + + with_intel_runtime_pm(&i915->runtime_pm, wakeref) { + if (slpc_query_task_state(slpc)) + return -EIO; + + slpc_tasks = &data->task_state_data; + + drm_printf(p, "SLPC state: %s\n", slpc_state_string(slpc)); + drm_printf(p, "\tgtperf task active: %s\n", + yesno(slpc_tasks->status & SLPC_GTPERF_TASK_ACTIVE)); + drm_printf(p, "\tdcc task active: %s\n", + yesno(slpc_tasks->status & SLPC_DCC_TASK_ACTIVE)); + drm_printf(p, "\tin dcc: %s\n", + yesno(slpc_tasks->status & SLPC_IN_DCC)); + drm_printf(p, "\tfreq switch active: %s\n", + yesno(slpc_tasks->status & SLPC_FREQ_SWITCH_ACTIVE)); + drm_printf(p, "\tibc enabled: %s\n", + yesno(slpc_tasks->status & SLPC_IBC_ENABLED)); + drm_printf(p, "\tibc active: %s\n", + yesno(slpc_tasks->status & SLPC_IBC_ACTIVE)); + drm_printf(p, "\tpg1 enabled: %s\n", + yesno(slpc_tasks->status & SLPC_PG1_ENABLED)); + drm_printf(p, "\tpg1 active: %s\n", + yesno(slpc_tasks->status & SLPC_PG1_ACTIVE)); + drm_printf(p, "\tmax freq: %dMHz\n", + slpc_decode_max_freq(slpc)); + drm_printf(p, "\tmin freq: %dMHz\n", + slpc_decode_min_freq(slpc)); + } + + return ret; +} + void intel_guc_slpc_fini(struct intel_guc_slpc *slpc) { if (!slpc->vma) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h index 627c71a95777..852c6316aa47 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h @@ -10,6 +10,8 @@ #include "intel_guc_slpc_types.h" #include "abi/guc_actions_slpc_abi.h" +struct drm_printer; + static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) { return guc->slpc_supported; @@ -26,7 +28,6 @@ static inline bool intel_guc_slpc_is_used(struct intel_guc *guc) } void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc); - int intel_guc_slpc_init(struct intel_guc_slpc *slpc); int intel_guc_slpc_enable(struct intel_guc_slpc *slpc); void intel_guc_slpc_fini(struct intel_guc_slpc *slpc); @@ -34,5 +35,6 @@ int intel_guc_slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 val); int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val); int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val); int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val); +int intel_guc_slpc_info(struct intel_guc_slpc *slpc, struct drm_printer *p); #endif