[PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Chris Wilson]

Previously we hesitated in adding the hw probe for the actual GPU
frequency for rps_boost as it is quite cumbersome, but given some
surprising HW behaviour it would be useful to know both the RPS boost
state and the actual HW state in one location.

Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b4744a68cd88..ce17a53b3a66 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2215,8 +2215,22 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct drm_device *dev = &dev_priv->drm;
 	struct intel_rps *rps = &dev_priv->gt_pm.rps;
+	u32 act_freq = rps->cur_freq;
 	struct drm_file *file;
 
+	if (intel_runtime_pm_get_if_in_use(dev_priv)) {
+		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+			mutex_lock(&dev_priv->pcu_lock);
+			act_freq = vlv_punit_read(dev_priv,
+						  PUNIT_REG_GPU_FREQ_STS);
+			mutex_unlock(&dev_priv->pcu_lock);
+		} else {
+			act_freq = intel_get_cagf(dev_priv,
+						  I915_READ(GEN6_RPSTAT1));
+		}
+		intel_runtime_pm_put(dev_priv);
+	}
+
 	seq_printf(m, "RPS enabled? %d\n", rps->enabled);
 	seq_printf(m, "GPU busy? %s [%d requests]\n",
 		   yesno(dev_priv->gt.awake), dev_priv->gt.active_requests);
@@ -2224,8 +2238,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 	seq_printf(m, "Boosts outstanding? %d\n",
 		   atomic_read(&rps->num_waiters));
 	seq_printf(m, "Interactive? %d\n", READ_ONCE(rps->power.interactive));
-	seq_printf(m, "Frequency requested %d\n",
-		   intel_gpu_freq(dev_priv, rps->cur_freq));
+	seq_printf(m, "Frequency requested %d, actual %d\n",
+		   intel_gpu_freq(dev_priv, rps->cur_freq),
+		   intel_gpu_freq(dev_priv, act_freq));
 	seq_printf(m, "  min hard:%d, soft:%d; max soft:%d, hard:%d\n",
 		   intel_gpu_freq(dev_priv, rps->min_freq),
 		   intel_gpu_freq(dev_priv, rps->min_freq_softlimit),
-- 
2.19.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Patchwork]

== Series Details ==

Series: drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info
URL   : https://patchwork.freedesktop.org/series/50431/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4913 -> Patchwork_10320 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/50431/revisions/1/mbox/

== Known issues ==

  Here are the changes found in Patchwork_10320 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@amdgpu/amd_cs_nop@sync-fork-compute0:
      fi-kbl-8809g:       PASS -> DMESG-WARN (fdo#107762)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
      fi-bdw-samus:       NOTRUN -> INCOMPLETE (fdo#107773)

    
    ==== Possible fixes ====

    igt@gem_exec_suspend@basic-s3:
      fi-bdw-samus:       INCOMPLETE (fdo#107773) -> PASS
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-byt-clapper:     FAIL (fdo#103191, fdo#107362) -> PASS

    
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
  fdo#107762 https://bugs.freedesktop.org/show_bug.cgi?id=107762
  fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773


== Participating hosts (46 -> 43) ==

  Missing    (3): fi-bsw-cyan fi-byt-squawks fi-icl-u2 


== Build changes ==

    * Linux: CI_DRM_4913 -> Patchwork_10320

  CI_DRM_4913: 8841faa15ae85eff15d285c64353d2b75d7b400f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4660: d0975646c50568e66e65b44b81d28232d059b94e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10320: 8729ba6ac2497288cdcbae17ef8e1105aa721245 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

8729ba6ac249 drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10320/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Tvrtko Ursulin]

On 02/10/2018 09:36, Chris Wilson wrote:
> Previously we hesitated in adding the hw probe for the actual GPU
> frequency for rps_boost as it is quite cumbersome, but given some
> surprising HW behaviour it would be useful to know both the RPS boost
> state and the actual HW state in one location.
> 
> Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++++--
>   1 file changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index b4744a68cd88..ce17a53b3a66 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2215,8 +2215,22 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
>   	struct drm_i915_private *dev_priv = node_to_i915(m->private);
>   	struct drm_device *dev = &dev_priv->drm;
>   	struct intel_rps *rps = &dev_priv->gt_pm.rps;
> +	u32 act_freq = rps->cur_freq;
>   	struct drm_file *file;
>   
> +	if (intel_runtime_pm_get_if_in_use(dev_priv)) {
> +		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> +			mutex_lock(&dev_priv->pcu_lock);
> +			act_freq = vlv_punit_read(dev_priv,
> +						  PUNIT_REG_GPU_FREQ_STS);

There is another read site for this reg which right shifts and masks 
before passing to intel_gpu_freq. Who is right and who is wrong? :)

Regards,

Tvrtko`

> +			mutex_unlock(&dev_priv->pcu_lock);
> +		} else {
> +			act_freq = intel_get_cagf(dev_priv,
> +						  I915_READ(GEN6_RPSTAT1));
> +		}
> +		intel_runtime_pm_put(dev_priv);
> +	}
> +
>   	seq_printf(m, "RPS enabled? %d\n", rps->enabled);
>   	seq_printf(m, "GPU busy? %s [%d requests]\n",
>   		   yesno(dev_priv->gt.awake), dev_priv->gt.active_requests);
> @@ -2224,8 +2238,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
>   	seq_printf(m, "Boosts outstanding? %d\n",
>   		   atomic_read(&rps->num_waiters));
>   	seq_printf(m, "Interactive? %d\n", READ_ONCE(rps->power.interactive));
> -	seq_printf(m, "Frequency requested %d\n",
> -		   intel_gpu_freq(dev_priv, rps->cur_freq));
> +	seq_printf(m, "Frequency requested %d, actual %d\n",
> +		   intel_gpu_freq(dev_priv, rps->cur_freq),
> +		   intel_gpu_freq(dev_priv, act_freq));
>   	seq_printf(m, "  min hard:%d, soft:%d; max soft:%d, hard:%d\n",
>   		   intel_gpu_freq(dev_priv, rps->min_freq),
>   		   intel_gpu_freq(dev_priv, rps->min_freq_softlimit),
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Chris Wilson]

Quoting Tvrtko Ursulin (2018-10-02 12:02:26)
> 
> On 02/10/2018 09:36, Chris Wilson wrote:
> > Previously we hesitated in adding the hw probe for the actual GPU
> > frequency for rps_boost as it is quite cumbersome, but given some
> > surprising HW behaviour it would be useful to know both the RPS boost
> > state and the actual HW state in one location.
> > 
> > Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> >   drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++++--
> >   1 file changed, 17 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index b4744a68cd88..ce17a53b3a66 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2215,8 +2215,22 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
> >       struct drm_i915_private *dev_priv = node_to_i915(m->private);
> >       struct drm_device *dev = &dev_priv->drm;
> >       struct intel_rps *rps = &dev_priv->gt_pm.rps;
> > +     u32 act_freq = rps->cur_freq;
> >       struct drm_file *file;
> >   
> > +     if (intel_runtime_pm_get_if_in_use(dev_priv)) {
> > +             if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> > +                     mutex_lock(&dev_priv->pcu_lock);
> > +                     act_freq = vlv_punit_read(dev_priv,
> > +                                               PUNIT_REG_GPU_FREQ_STS);
> 
> There is another read site for this reg which right shifts and masks 
> before passing to intel_gpu_freq. Who is right and who is wrong? :)

Considering that's where I copied from... Oops.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2] drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info

[Chris Wilson]

Previously we hesitated in adding the hw probe for the actual GPU
frequency for rps_boost as it is quite cumbersome, but given some
surprising HW behaviour it would be useful to know both the RPS boost
state and the actual HW state in one location.

v2: vlv/chv needs more tlc

Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b4744a68cd88..f42e93b71e67 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2215,8 +2215,23 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct drm_device *dev = &dev_priv->drm;
 	struct intel_rps *rps = &dev_priv->gt_pm.rps;
+	u32 act_freq = rps->cur_freq;
 	struct drm_file *file;
 
+	if (intel_runtime_pm_get_if_in_use(dev_priv)) {
+		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+			mutex_lock(&dev_priv->pcu_lock);
+			act_freq = vlv_punit_read(dev_priv,
+						  PUNIT_REG_GPU_FREQ_STS);
+			act_freq = (act_freq >> 8) & 0xff;
+			mutex_unlock(&dev_priv->pcu_lock);
+		} else {
+			act_freq = intel_get_cagf(dev_priv,
+						  I915_READ(GEN6_RPSTAT1));
+		}
+		intel_runtime_pm_put(dev_priv);
+	}
+
 	seq_printf(m, "RPS enabled? %d\n", rps->enabled);
 	seq_printf(m, "GPU busy? %s [%d requests]\n",
 		   yesno(dev_priv->gt.awake), dev_priv->gt.active_requests);
@@ -2224,8 +2239,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 	seq_printf(m, "Boosts outstanding? %d\n",
 		   atomic_read(&rps->num_waiters));
 	seq_printf(m, "Interactive? %d\n", READ_ONCE(rps->power.interactive));
-	seq_printf(m, "Frequency requested %d\n",
-		   intel_gpu_freq(dev_priv, rps->cur_freq));
+	seq_printf(m, "Frequency requested %d, actual %d\n",
+		   intel_gpu_freq(dev_priv, rps->cur_freq),
+		   intel_gpu_freq(dev_priv, act_freq));
 	seq_printf(m, "  min hard:%d, soft:%d; max soft:%d, hard:%d\n",
 		   intel_gpu_freq(dev_priv, rps->min_freq),
 		   intel_gpu_freq(dev_priv, rps->min_freq_softlimit),
-- 
2.19.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info

[Tvrtko Ursulin]

On 02/10/2018 12:32, Chris Wilson wrote:
> Previously we hesitated in adding the hw probe for the actual GPU
> frequency for rps_boost as it is quite cumbersome, but given some
> surprising HW behaviour it would be useful to know both the RPS boost
> state and the actual HW state in one location.
> 
> v2: vlv/chv needs more tlc
> 
> Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> ---
>   drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++++++++++--
>   1 file changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index b4744a68cd88..f42e93b71e67 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2215,8 +2215,23 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
>   	struct drm_i915_private *dev_priv = node_to_i915(m->private);
>   	struct drm_device *dev = &dev_priv->drm;
>   	struct intel_rps *rps = &dev_priv->gt_pm.rps;
> +	u32 act_freq = rps->cur_freq;

I assume this will be zero when device is runtime suspended? If so:

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

Regards,

Tvrtko

>   	struct drm_file *file;
>   
> +	if (intel_runtime_pm_get_if_in_use(dev_priv)) {
> +		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> +			mutex_lock(&dev_priv->pcu_lock);
> +			act_freq = vlv_punit_read(dev_priv,
> +						  PUNIT_REG_GPU_FREQ_STS);
> +			act_freq = (act_freq >> 8) & 0xff;
> +			mutex_unlock(&dev_priv->pcu_lock);
> +		} else {
> +			act_freq = intel_get_cagf(dev_priv,
> +						  I915_READ(GEN6_RPSTAT1));
> +		}
> +		intel_runtime_pm_put(dev_priv);
> +	}
> +
>   	seq_printf(m, "RPS enabled? %d\n", rps->enabled);
>   	seq_printf(m, "GPU busy? %s [%d requests]\n",
>   		   yesno(dev_priv->gt.awake), dev_priv->gt.active_requests);
> @@ -2224,8 +2239,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
>   	seq_printf(m, "Boosts outstanding? %d\n",
>   		   atomic_read(&rps->num_waiters));
>   	seq_printf(m, "Interactive? %d\n", READ_ONCE(rps->power.interactive));
> -	seq_printf(m, "Frequency requested %d\n",
> -		   intel_gpu_freq(dev_priv, rps->cur_freq));
> +	seq_printf(m, "Frequency requested %d, actual %d\n",
> +		   intel_gpu_freq(dev_priv, rps->cur_freq),
> +		   intel_gpu_freq(dev_priv, act_freq));
>   	seq_printf(m, "  min hard:%d, soft:%d; max soft:%d, hard:%d\n",
>   		   intel_gpu_freq(dev_priv, rps->min_freq),
>   		   intel_gpu_freq(dev_priv, rps->min_freq_softlimit),
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info

[Chris Wilson]

Quoting Tvrtko Ursulin (2018-10-02 12:41:18)
> 
> On 02/10/2018 12:32, Chris Wilson wrote:
> > Previously we hesitated in adding the hw probe for the actual GPU
> > frequency for rps_boost as it is quite cumbersome, but given some
> > surprising HW behaviour it would be useful to know both the RPS boost
> > state and the actual HW state in one location.
> > 
> > v2: vlv/chv needs more tlc
> > 
> > Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> > ---
> >   drivers/gpu/drm/i915/i915_debugfs.c | 20 ++++++++++++++++++--
> >   1 file changed, 18 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index b4744a68cd88..f42e93b71e67 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2215,8 +2215,23 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
> >       struct drm_i915_private *dev_priv = node_to_i915(m->private);
> >       struct drm_device *dev = &dev_priv->drm;
> >       struct intel_rps *rps = &dev_priv->gt_pm.rps;
> > +     u32 act_freq = rps->cur_freq;
> 
> I assume this will be zero when device is runtime suspended? If so:

In theory, if it were to report, it should be idle_freq (and match
cur_freq). In rps_boost, I'm not concerned about idle :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info (rev2)
URL   : https://patchwork.freedesktop.org/series/50431/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4914 -> Patchwork_10323 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/50431/revisions/2/mbox/

== Known issues ==

  Here are the changes found in Patchwork_10323 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_coherency:
      fi-gdg-551:         PASS -> DMESG-FAIL (fdo#107164)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
      fi-bdw-samus:       NOTRUN -> INCOMPLETE (fdo#107773)

    
    ==== Possible fixes ====

    igt@amdgpu/amd_cs_nop@fork-gfx0:
      fi-kbl-8809g:       DMESG-WARN (fdo#107762) -> PASS

    igt@drv_module_reload@basic-reload:
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
      fi-skl-guc:         FAIL (fdo#103191) -> PASS

    
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
  fdo#107762 https://bugs.freedesktop.org/show_bug.cgi?id=107762
  fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773


== Participating hosts (44 -> 43) ==

  Additional (2): fi-bdw-samus fi-pnv-d510 
  Missing    (3): fi-bsw-cyan fi-byt-squawks fi-icl-u2 


== Build changes ==

    * Linux: CI_DRM_4914 -> Patchwork_10323

  CI_DRM_4914: 7bb6a990d5bfa66c62bbdb97ae74c1ce5c828a19 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4660: d0975646c50568e66e65b44b81d28232d059b94e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10323: 4fdc1f72b26c98970cc4acd7ef830f1e18eaf799 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

4fdc1f72b26c drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10323/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Ville Syrjälä]

On Tue, Oct 02, 2018 at 12:11:51PM +0100, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2018-10-02 12:02:26)
> > 
> > On 02/10/2018 09:36, Chris Wilson wrote:
> > > Previously we hesitated in adding the hw probe for the actual GPU
> > > frequency for rps_boost as it is quite cumbersome, but given some
> > > surprising HW behaviour it would be useful to know both the RPS boost
> > > state and the actual HW state in one location.
> > > 
> > > Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > ---
> > >   drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++++--
> > >   1 file changed, 17 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > > index b4744a68cd88..ce17a53b3a66 100644
> > > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > > @@ -2215,8 +2215,22 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
> > >       struct drm_i915_private *dev_priv = node_to_i915(m->private);
> > >       struct drm_device *dev = &dev_priv->drm;
> > >       struct intel_rps *rps = &dev_priv->gt_pm.rps;
> > > +     u32 act_freq = rps->cur_freq;
> > >       struct drm_file *file;
> > >   
> > > +     if (intel_runtime_pm_get_if_in_use(dev_priv)) {
> > > +             if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> > > +                     mutex_lock(&dev_priv->pcu_lock);
> > > +                     act_freq = vlv_punit_read(dev_priv,
> > > +                                               PUNIT_REG_GPU_FREQ_STS);
> > 
> > There is another read site for this reg which right shifts and masks 
> > before passing to intel_gpu_freq. Who is right and who is wrong? :)
> 
> Considering that's where I copied from... Oops.

Worth adding intel_gpu_act_freq() or something?

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info

[Chris Wilson]

Quoting Ville Syrjälä (2018-10-02 16:46:55)
> On Tue, Oct 02, 2018 at 12:11:51PM +0100, Chris Wilson wrote:
> > Quoting Tvrtko Ursulin (2018-10-02 12:02:26)
> > > 
> > > On 02/10/2018 09:36, Chris Wilson wrote:
> > > > Previously we hesitated in adding the hw probe for the actual GPU
> > > > frequency for rps_boost as it is quite cumbersome, but given some
> > > > surprising HW behaviour it would be useful to know both the RPS boost
> > > > state and the actual HW state in one location.
> > > > 
> > > > Reported-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
> > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > > ---
> > > >   drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++++--
> > > >   1 file changed, 17 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > > > index b4744a68cd88..ce17a53b3a66 100644
> > > > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > > > @@ -2215,8 +2215,22 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
> > > >       struct drm_i915_private *dev_priv = node_to_i915(m->private);
> > > >       struct drm_device *dev = &dev_priv->drm;
> > > >       struct intel_rps *rps = &dev_priv->gt_pm.rps;
> > > > +     u32 act_freq = rps->cur_freq;
> > > >       struct drm_file *file;
> > > >   
> > > > +     if (intel_runtime_pm_get_if_in_use(dev_priv)) {
> > > > +             if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> > > > +                     mutex_lock(&dev_priv->pcu_lock);
> > > > +                     act_freq = vlv_punit_read(dev_priv,
> > > > +                                               PUNIT_REG_GPU_FREQ_STS);
> > > 
> > > There is another read site for this reg which right shifts and masks 
> > > before passing to intel_gpu_freq. Who is right and who is wrong? :)
> > 
> > Considering that's where I copied from... Oops.
> 
> Worth adding intel_gpu_act_freq() or something?

Whoever is guilty of adding the third copy... ;)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: failure for drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Show actual along side request frequency in debugfs/i915_rps_boost_info (rev2)
URL   : https://patchwork.freedesktop.org/series/50431/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4914_full -> Patchwork_10323_full =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_10323_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_10323_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_10323_full:

  === IGT changes ===

    ==== Possible regressions ====

    igt@kms_color@pipe-a-ctm-max:
      shard-apl:          PASS -> FAIL +1

    igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-xtiled:
      shard-skl:          PASS -> FAIL +1

    igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
      shard-apl:          NOTRUN -> FAIL

    igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
      shard-skl:          NOTRUN -> FAIL

    
== Known issues ==

  Here are the changes found in Patchwork_10323_full that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_await@wide-contexts:
      shard-apl:          PASS -> FAIL (fdo#106680)

    igt@gem_exec_suspend@basic-s3:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411)

    igt@kms_available_modes_crc@available_mode_test_crc:
      shard-skl:          NOTRUN -> FAIL (fdo#106641)

    igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
      shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-hang-newfb-render-a:
      shard-apl:          PASS -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
      shard-glk:          PASS -> DMESG-WARN (fdo#107956) +1

    igt@kms_cursor_crc@cursor-256x85-random:
      shard-apl:          PASS -> FAIL (fdo#103232) +1

    igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-xtiled:
      shard-skl:          PASS -> FAIL (fdo#103184)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
      shard-apl:          PASS -> FAIL (fdo#103167) +2

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
      shard-glk:          PASS -> FAIL (fdo#103167) +1

    igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665)

    igt@kms_plane@plane-position-covered-pipe-a-planes:
      shard-apl:          PASS -> FAIL (fdo#103166) +1

    igt@pm_rpm@sysfs-read:
      shard-skl:          PASS -> INCOMPLETE (fdo#107807) +1

    
    ==== Possible fixes ====

    igt@drv_hangman@error-state-capture-render:
      shard-apl:          INCOMPLETE (fdo#103927) -> PASS

    igt@gem_exec_await@wide-contexts:
      shard-glk:          FAIL (fdo#106680) -> PASS

    igt@kms_color@pipe-b-ctm-max:
      shard-apl:          FAIL -> PASS +1

    igt@kms_cursor_crc@cursor-128x128-dpms:
      shard-apl:          FAIL (fdo#103232) -> PASS +1

    igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled:
      shard-skl:          FAIL (fdo#103184) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-apl:          FAIL (fdo#103167) -> PASS +2

    igt@kms_frontbuffer_tracking@fbc-1p-rte:
      shard-apl:          FAIL (fdo#105682, fdo#103167) -> PASS

    igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-blt:
      shard-glk:          FAIL (fdo#103167) -> PASS

    igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
      shard-apl:          FAIL (fdo#103166) -> PASS +1

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS
      shard-kbl:          FAIL (fdo#99912) -> PASS

    igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
      shard-apl:          DMESG-WARN (fdo#105602, fdo#103558) -> PASS +9

    
  fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
  fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
  fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
  fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
  fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
  fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
  fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
  fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
  fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


== Participating hosts (6 -> 6) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4914 -> Patchwork_10323

  CI_DRM_4914: 7bb6a990d5bfa66c62bbdb97ae74c1ce5c828a19 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4660: d0975646c50568e66e65b44b81d28232d059b94e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10323: 4fdc1f72b26c98970cc4acd7ef830f1e18eaf799 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10323/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx