* [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
@ 2015-04-27 14:30 Peter Antoine
2015-04-27 14:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4 Peter Antoine
2015-04-28 9:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 shuang.he
0 siblings, 2 replies; 8+ messages in thread
From: Peter Antoine @ 2015-04-27 14:30 UTC (permalink / raw)
To: intel-gfx; +Cc: deepak.s, yex.tian, david.weinehall
This patch fixed a timing issue that causes a GPU hang when a the system
comes out of power saving.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index e70adfd..648866f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -712,6 +712,11 @@ static int i915_drm_resume(struct drm_device *dev)
intel_init_pch_refclk(dev);
drm_mode_config_reset(dev);
+ /* We need working interrupts for modeset enabling ... */
+ intel_runtime_pm_enable_interrupts(dev_priv);
+
+ intel_modeset_init_hw(dev);
+
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
@@ -719,11 +724,6 @@ static int i915_drm_resume(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- /* We need working interrupts for modeset enabling ... */
- intel_runtime_pm_enable_interrupts(dev_priv);
-
- intel_modeset_init_hw(dev);
-
spin_lock_irq(&dev_priv->irq_lock);
if (dev_priv->display.hpd_irq_setup)
dev_priv->display.hpd_irq_setup(dev);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4
2015-04-27 14:30 [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 Peter Antoine
@ 2015-04-27 14:30 ` Peter Antoine
2015-04-28 9:29 ` shuang.he
2015-04-28 9:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 shuang.he
1 sibling, 1 reply; 8+ messages in thread
From: Peter Antoine @ 2015-04-27 14:30 UTC (permalink / raw)
To: intel-gfx; +Cc: deepak.s, yex.tian, david.weinehall
This patch fixed a timing issue that causes a GPU hang when a the system
comes out of power saving.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index e70adfd..648866f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -712,6 +712,11 @@ static int i915_drm_resume(struct drm_device *dev)
intel_init_pch_refclk(dev);
drm_mode_config_reset(dev);
+ /* We need working interrupts for modeset enabling ... */
+ intel_runtime_pm_enable_interrupts(dev_priv);
+
+ intel_modeset_init_hw(dev);
+
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
@@ -719,11 +724,6 @@ static int i915_drm_resume(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- /* We need working interrupts for modeset enabling ... */
- intel_runtime_pm_enable_interrupts(dev_priv);
-
- intel_modeset_init_hw(dev);
-
spin_lock_irq(&dev_priv->irq_lock);
if (dev_priv->display.hpd_irq_setup)
dev_priv->display.hpd_irq_setup(dev);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4
2015-04-27 14:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4 Peter Antoine
@ 2015-04-28 9:29 ` shuang.he
0 siblings, 0 replies; 8+ messages in thread
From: shuang.he @ 2015-04-28 9:29 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, peter.antoine
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6271
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276
ILK -1 302/302 301/302
SNB 318/318 318/318
IVB 341/341 341/341
BYT 287/287 287/287
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@gem_fenced_exec_thrash@no-spare-fences-busy PASS(4) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...bsd_ring_idle@Hangcheck timer elapsed... bsd ring idle
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
2015-04-27 14:30 [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 Peter Antoine
2015-04-27 14:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4 Peter Antoine
@ 2015-04-28 9:30 ` shuang.he
1 sibling, 0 replies; 8+ messages in thread
From: shuang.he @ 2015-04-28 9:30 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, peter.antoine
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6271
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276
ILK -1 302/302 301/302
SNB 318/318 318/318
IVB 341/341 341/341
BYT 287/287 287/287
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@gem_fenced_exec_thrash@no-spare-fences-busy PASS(4) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...bsd_ring_idle@Hangcheck timer elapsed... bsd ring idle
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
@ 2015-04-27 14:25 Peter Antoine
2015-04-27 14:31 ` Antoine, Peter
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Peter Antoine @ 2015-04-27 14:25 UTC (permalink / raw)
To: intel-gfx; +Cc: deepak.s, yex.tian, david.weinehall
This patch fixed a timing issue that causes a GPU hang when a the system
comes out of power saving.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index e70adfd..648866f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -712,6 +712,11 @@ static int i915_drm_resume(struct drm_device *dev)
intel_init_pch_refclk(dev);
drm_mode_config_reset(dev);
+ /* We need working interrupts for modeset enabling ... */
+ intel_runtime_pm_enable_interrupts(dev_priv);
+
+ intel_modeset_init_hw(dev);
+
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
@@ -719,11 +724,6 @@ static int i915_drm_resume(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- /* We need working interrupts for modeset enabling ... */
- intel_runtime_pm_enable_interrupts(dev_priv);
-
- intel_modeset_init_hw(dev);
-
spin_lock_irq(&dev_priv->irq_lock);
if (dev_priv->display.hpd_irq_setup)
dev_priv->display.hpd_irq_setup(dev);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
2015-04-27 14:25 Peter Antoine
@ 2015-04-27 14:31 ` Antoine, Peter
2015-04-27 14:33 ` Chris Wilson
2015-04-28 9:31 ` shuang.he
2 siblings, 0 replies; 8+ messages in thread
From: Antoine, Peter @ 2015-04-27 14:31 UTC (permalink / raw)
To: intel-gfx; +Cc: S, Deepak, Tian, YeX, Weinehall, David
Ignore this. I mean S3/S4 not P3/P4.
-----Original Message-----
From: Antoine, Peter
Sent: Monday, April 27, 2015 3:25 PM
To: intel-gfx@lists.freedesktop.org
Cc: S, Deepak; Weinehall, David; Tian, YeX; Antoine, Peter
Subject: [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
This patch fixed a timing issue that causes a GPU hang when a the system comes out of power saving.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index e70adfd..648866f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -712,6 +712,11 @@ static int i915_drm_resume(struct drm_device *dev)
intel_init_pch_refclk(dev);
drm_mode_config_reset(dev);
+ /* We need working interrupts for modeset enabling ... */
+ intel_runtime_pm_enable_interrupts(dev_priv);
+
+ intel_modeset_init_hw(dev);
+
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n"); @@ -719,11 +724,6 @@ static int i915_drm_resume(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- /* We need working interrupts for modeset enabling ... */
- intel_runtime_pm_enable_interrupts(dev_priv);
-
- intel_modeset_init_hw(dev);
-
spin_lock_irq(&dev_priv->irq_lock);
if (dev_priv->display.hpd_irq_setup)
dev_priv->display.hpd_irq_setup(dev);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
2015-04-27 14:25 Peter Antoine
2015-04-27 14:31 ` Antoine, Peter
@ 2015-04-27 14:33 ` Chris Wilson
2015-04-28 9:31 ` shuang.he
2 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2015-04-27 14:33 UTC (permalink / raw)
To: Peter Antoine; +Cc: deepak.s, intel-gfx, david.weinehall, yex.tian
On Mon, Apr 27, 2015 at 03:25:14PM +0100, Peter Antoine wrote:
> This patch fixed a timing issue that causes a GPU hang when a the system
> comes out of power saving.
A few more details to explain the timing issue and why this is a fix and
not just papering over the bug.
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89600
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index e70adfd..648866f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -712,6 +712,11 @@ static int i915_drm_resume(struct drm_device *dev)
> intel_init_pch_refclk(dev);
> drm_mode_config_reset(dev);
>
> + /* We need working interrupts for modeset enabling ... */
> + intel_runtime_pm_enable_interrupts(dev_priv);
> +
> + intel_modeset_init_hw(dev);
Both? This makes resume do init_hw() in a different order to other
pieces of the reset/resume puzzle. Why? Do we need to consider fixing
the other pieces of code as well?
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4
2015-04-27 14:25 Peter Antoine
2015-04-27 14:31 ` Antoine, Peter
2015-04-27 14:33 ` Chris Wilson
@ 2015-04-28 9:31 ` shuang.he
2 siblings, 0 replies; 8+ messages in thread
From: shuang.he @ 2015-04-28 9:31 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, peter.antoine
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6271
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276
ILK -1 302/302 301/302
SNB 318/318 318/318
IVB 341/341 341/341
BYT 287/287 287/287
BDW 318/318 318/318
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@gem_fenced_exec_thrash@no-spare-fences-busy PASS(4) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...bsd_ring_idle@Hangcheck timer elapsed... bsd ring idle
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-04-28 9:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-27 14:30 [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 Peter Antoine
2015-04-27 14:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of S3 or S4 Peter Antoine
2015-04-28 9:29 ` shuang.he
2015-04-28 9:30 ` [PATCH] drm/i915: Avoid GPU hang when coming out of P3 or P4 shuang.he
-- strict thread matches above, loose matches on Subject: below --
2015-04-27 14:25 Peter Antoine
2015-04-27 14:31 ` Antoine, Peter
2015-04-27 14:33 ` Chris Wilson
2015-04-28 9:31 ` shuang.he
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.