public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
@ 2016-08-02 11:07 ville.syrjala
  2016-08-02 11:16 ` Imre Deak
  2016-08-02 11:28 ` ✗ Ro.CI.BAT: failure for " Patchwork
  0 siblings, 2 replies; 5+ messages in thread
From: ville.syrjala @ 2016-08-02 11:07 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Remove the CHV early bail out from intel_cleanup_gt_powersave() so that
we'll clean up the extra RPM reference held due to i915.enable_rc6=0.

Cc: Imre Deak <imre.deak@intel.com>
Fixes: b268c699aca5 ("drm/i915: refactor RPM disabling due to RC6 being disabled")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1ac32428d4db..125faac2fb5d 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6533,9 +6533,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)
 
 void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv)
 {
-	if (IS_CHERRYVIEW(dev_priv))
-		return;
-	else if (IS_VALLEYVIEW(dev_priv))
+	if (IS_VALLEYVIEW(dev_priv))
 		valleyview_cleanup_gt_powersave(dev_priv);
 
 	if (!i915.enable_rc6)
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
  2016-08-02 11:07 [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0 ville.syrjala
@ 2016-08-02 11:16 ` Imre Deak
  2016-08-03 15:44   ` Ville Syrjälä
  2016-08-02 11:28 ` ✗ Ro.CI.BAT: failure for " Patchwork
  1 sibling, 1 reply; 5+ messages in thread
From: Imre Deak @ 2016-08-02 11:16 UTC (permalink / raw)
  To: ville.syrjala, intel-gfx

On ti, 2016-08-02 at 14:07 +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Remove the CHV early bail out from intel_cleanup_gt_powersave() so that
> we'll clean up the extra RPM reference held due to i915.enable_rc6=0.
> 
> Cc: Imre Deak <imre.deak@intel.com>
> Fixes: b268c699aca5 ("drm/i915: refactor RPM disabling due to RC6 being disabled")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Thanks for catching it:
Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 1ac32428d4db..125faac2fb5d 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -6533,9 +6533,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)
>  
>  void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv)
>  {
> -	if (IS_CHERRYVIEW(dev_priv))
> -		return;
> -	else if (IS_VALLEYVIEW(dev_priv))
> +	if (IS_VALLEYVIEW(dev_priv))
>  		valleyview_cleanup_gt_powersave(dev_priv);
>  
>  	if (!i915.enable_rc6)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread

* ✗ Ro.CI.BAT: failure for drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
  2016-08-02 11:07 [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0 ville.syrjala
  2016-08-02 11:16 ` Imre Deak
@ 2016-08-02 11:28 ` Patchwork
  2016-08-03 13:53   ` Ville Syrjälä
  1 sibling, 1 reply; 5+ messages in thread
From: Patchwork @ 2016-08-02 11:28 UTC (permalink / raw)
  To: ville.syrjala; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
URL   : https://patchwork.freedesktop.org/series/10505/
State : failure

== Summary ==

Series 10505v1 drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
http://patchwork.freedesktop.org/api/1.0/series/10505/revisions/1/mbox

Test kms_cursor_legacy:
        Subgroup basic-cursor-vs-flip-varying-size:
                pass       -> FAIL       (ro-ilk1-i5-650)
        Subgroup basic-flip-vs-cursor-legacy:
                pass       -> FAIL       (ro-bdw-i5-5250u)
        Subgroup basic-flip-vs-cursor-varying-size:
                fail       -> PASS       (ro-hsw-i7-4770r)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (ro-bdw-i7-5557U)

fi-skl-i5-6260u  total:240  pass:224  dwarn:0   dfail:0   fail:2   skip:14 
fi-skl-i7-6700k  total:240  pass:208  dwarn:0   dfail:0   fail:4   skip:28 
fi-snb-i7-2600   total:240  pass:198  dwarn:0   dfail:0   fail:0   skip:42 
ro-bdw-i5-5250u  total:240  pass:218  dwarn:4   dfail:0   fail:2   skip:16 
ro-bdw-i7-5557U  total:240  pass:223  dwarn:1   dfail:0   fail:0   skip:16 
ro-bdw-i7-5600u  total:240  pass:207  dwarn:0   dfail:0   fail:1   skip:32 
ro-bsw-n3050     total:240  pass:194  dwarn:0   dfail:0   fail:4   skip:42 
ro-byt-n2820     total:240  pass:197  dwarn:0   dfail:0   fail:3   skip:40 
ro-hsw-i3-4010u  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
ro-hsw-i7-4770r  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
ro-ilk-i7-620lm  total:240  pass:172  dwarn:1   dfail:0   fail:2   skip:65 
ro-ilk1-i5-650   total:235  pass:172  dwarn:0   dfail:0   fail:3   skip:60 
ro-ivb-i7-3770   total:240  pass:205  dwarn:0   dfail:0   fail:0   skip:35 
ro-ivb2-i7-3770  total:240  pass:209  dwarn:0   dfail:0   fail:0   skip:31 
ro-skl3-i5-6260u total:240  pass:222  dwarn:0   dfail:0   fail:4   skip:14 
ro-snb-i7-2620M  total:240  pass:198  dwarn:0   dfail:0   fail:1   skip:41 
fi-hsw-i7-4770k failed to connect after reboot
fi-kbl-qkkr failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1666/

6f87e85 drm-intel-nightly: 2016y-08m-01d-14h-53m-17s UTC integration manifest
b3d5711 drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: ✗ Ro.CI.BAT: failure for drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
  2016-08-02 11:28 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-08-03 13:53   ` Ville Syrjälä
  0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2016-08-03 13:53 UTC (permalink / raw)
  To: intel-gfx

On Tue, Aug 02, 2016 at 11:28:50AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
> URL   : https://patchwork.freedesktop.org/series/10505/
> State : failure
> 
> == Summary ==
> 
> Series 10505v1 drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
> http://patchwork.freedesktop.org/api/1.0/series/10505/revisions/1/mbox
> 
> Test kms_cursor_legacy:
>         Subgroup basic-cursor-vs-flip-varying-size:
>                 pass       -> FAIL       (ro-ilk1-i5-650)

(kms_cursor_legacy:8089) DEBUG: Test requirement passed: target > 1
(kms_cursor_legacy:8089) DEBUG: Using a target of 32 cursor updates per half-vblank
(kms_cursor_legacy:8089) WARNING: page flip 54 was delayed, missed 1 frames
(kms_cursor_legacy:8089) CRITICAL: Test assertion failure function basic_cursor_vs_flip, file kms_cursor_legacy.c:670:
(kms_cursor_legacy:8089) CRITICAL: Failed assertion: vbl.sequence == vblank_start + 60
(kms_cursor_legacy:8089) CRITICAL: error: 11453 != 11452

https://bugs.freedesktop.org/show_bug.cgi?id=96701

>         Subgroup basic-flip-vs-cursor-legacy:
>                 pass       -> FAIL       (ro-bdw-i5-5250u)

(kms_cursor_legacy:8650) DEBUG: Test requirement passed: target > 1
(kms_cursor_legacy:8650) DEBUG: Using a target of 64 cursor updates per half-vblank
(kms_cursor_legacy:8650) CRITICAL: Test assertion failure function basic_flip_vs_cursor, file kms_cursor_legacy.c:514:
(kms_cursor_legacy:8650) CRITICAL: Failed assertion: get_vblank(display->drm_fd, pipe, 0) == vblank_start
(kms_cursor_legacy:8650) CRITICAL: error: 11084 != 11083

https://bugs.freedesktop.org/show_bug.cgi?id=97188

>         Subgroup basic-flip-vs-cursor-varying-size:
>                 fail       -> PASS       (ro-hsw-i7-4770r)
> Test kms_pipe_crc_basic:
>         Subgroup suspend-read-crc-pipe-a:
>                 pass       -> DMESG-WARN (ro-bdw-i7-5557U)

[  430.899878] [drm:intel_dp_link_training_clock_recovery [i915]] *ERROR* failed to enable link training
[  430.983638] [drm:intel_dp_start_link_train [i915]] *ERROR* failed to start channel equalization

https://bugs.freedesktop.org/show_bug.cgi?id=96614

> 
> fi-skl-i5-6260u  total:240  pass:224  dwarn:0   dfail:0   fail:2   skip:14 
> fi-skl-i7-6700k  total:240  pass:208  dwarn:0   dfail:0   fail:4   skip:28 
> fi-snb-i7-2600   total:240  pass:198  dwarn:0   dfail:0   fail:0   skip:42 
> ro-bdw-i5-5250u  total:240  pass:218  dwarn:4   dfail:0   fail:2   skip:16 
> ro-bdw-i7-5557U  total:240  pass:223  dwarn:1   dfail:0   fail:0   skip:16 
> ro-bdw-i7-5600u  total:240  pass:207  dwarn:0   dfail:0   fail:1   skip:32 
> ro-bsw-n3050     total:240  pass:194  dwarn:0   dfail:0   fail:4   skip:42 
> ro-byt-n2820     total:240  pass:197  dwarn:0   dfail:0   fail:3   skip:40 
> ro-hsw-i3-4010u  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
> ro-hsw-i7-4770r  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
> ro-ilk-i7-620lm  total:240  pass:172  dwarn:1   dfail:0   fail:2   skip:65 
> ro-ilk1-i5-650   total:235  pass:172  dwarn:0   dfail:0   fail:3   skip:60 
> ro-ivb-i7-3770   total:240  pass:205  dwarn:0   dfail:0   fail:0   skip:35 
> ro-ivb2-i7-3770  total:240  pass:209  dwarn:0   dfail:0   fail:0   skip:31 
> ro-skl3-i5-6260u total:240  pass:222  dwarn:0   dfail:0   fail:4   skip:14 
> ro-snb-i7-2620M  total:240  pass:198  dwarn:0   dfail:0   fail:1   skip:41 
> fi-hsw-i7-4770k failed to connect after reboot
> fi-kbl-qkkr failed to connect after reboot
> 
> Results at /archive/results/CI_IGT_test/RO_Patchwork_1666/
> 
> 6f87e85 drm-intel-nightly: 2016y-08m-01d-14h-53m-17s UTC integration manifest
> b3d5711 drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
  2016-08-02 11:16 ` Imre Deak
@ 2016-08-03 15:44   ` Ville Syrjälä
  0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2016-08-03 15:44 UTC (permalink / raw)
  To: Imre Deak; +Cc: intel-gfx

On Tue, Aug 02, 2016 at 02:16:02PM +0300, Imre Deak wrote:
> On ti, 2016-08-02 at 14:07 +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Remove the CHV early bail out from intel_cleanup_gt_powersave() so that
> > we'll clean up the extra RPM reference held due to i915.enable_rc6=0.
> > 
> > Cc: Imre Deak <imre.deak@intel.com>
> > Fixes: b268c699aca5 ("drm/i915: refactor RPM disabling due to RC6 being disabled")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Thanks for catching it:
> Reviewed-by: Imre Deak <imre.deak@intel.com>

Pushed to dinq. Thanks for the review.

> 
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 1ac32428d4db..125faac2fb5d 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -6533,9 +6533,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)
> >  
> >  void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv)
> >  {
> > -	if (IS_CHERRYVIEW(dev_priv))
> > -		return;
> > -	else if (IS_VALLEYVIEW(dev_priv))
> > +	if (IS_VALLEYVIEW(dev_priv))
> >  		valleyview_cleanup_gt_powersave(dev_priv);
> >  
> >  	if (!i915.enable_rc6)

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-08-03 15:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-02 11:07 [PATCH] drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0 ville.syrjala
2016-08-02 11:16 ` Imre Deak
2016-08-03 15:44   ` Ville Syrjälä
2016-08-02 11:28 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-08-03 13:53   ` Ville Syrjälä

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox