Re: [Intel-gfx] [PATCH 09/16] drm/i915: check for GT faults during S3 resume and S4 restore too

2014-09-11 Thread Chris Wilson 
On Wed, Sep 10, 2014 at 06:17:02PM +0300, Imre Deak wrote:
 Checking for GT faults is not specific in any way to S4 thaw, so do it
 also during S3 resume and S4 restore. This allows us to unify the
 handlers for these events in an upcoming patch.

So why not just move i915_check_and_clear_faults() to
intel_uncore_early_santize()? That would seem to be the right BIOS
scrubbing function that should also be doing this task.
-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

Re: [Intel-gfx] [PATCH 09/16] drm/i915: check for GT faults during S3 resume and S4 restore too

2014-09-11 Thread Imre Deak 
On Thu, 2014-09-11 at 08:47 +0100, Chris Wilson wrote:
 On Wed, Sep 10, 2014 at 06:17:02PM +0300, Imre Deak wrote:
  Checking for GT faults is not specific in any way to S4 thaw, so do it
  also during S3 resume and S4 restore. This allows us to unify the
  handlers for these events in an upcoming patch.
 
 So why not just move i915_check_and_clear_faults() to
 intel_uncore_early_santize()? That would seem to be the right BIOS
 scrubbing function that should also be doing this task.

Ok, haven't consider moving the check, but it makes sense.

--Imre



signature.asc
Description: This is a digitally signed message part
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 09/16] drm/i915: check for GT faults during S3 resume and S4 restore too

2014-09-10 Thread Imre Deak 
Checking for GT faults is not specific in any way to S4 thaw, so do it
also during S3 resume and S4 restore. This allows us to unify the
handlers for these events in an upcoming patch.

Signed-off-by: Imre Deak imre.d...@intel.com
---
 drivers/gpu/drm/i915/i915_drv.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5e25283..d0fee60 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -672,6 +672,8 @@ static int __i915_drm_thaw(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev-dev_private;
 
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+   i915_check_and_clear_faults(dev);
+
mutex_lock(dev-struct_mutex);
i915_gem_restore_gtt_mappings(dev);
mutex_unlock(dev-struct_mutex);
@@ -736,9 +738,6 @@ static int __i915_drm_thaw(struct drm_device *dev)
 
 static int i915_drm_thaw(struct drm_device *dev)
 {
-   if (drm_core_check_feature(dev, DRIVER_MODESET))
-   i915_check_and_clear_faults(dev);
-
return __i915_drm_thaw(dev);
 }
 
-- 
1.8.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx