Re: [Intel-gfx] [PATCH v2 3/3] drm/i915/error: capture uc_state after gen_state

2018-03-06 Thread Chris Wilson
Quoting Chris Wilson (2018-03-06 09:23:21)
> Quoting Daniele Ceraolo Spurio (2018-03-05 22:21:22)
> > error->device_info.has_guc, which we check in capture_uc_state, is set
> > in capture_gen_state, so the latter needs to be performed first.
> > 
> > v2: rebased
> > 
> > Reported-by: Vinay Belgaumkar 
> > Fixes: 7d41ef3479a6 (drm/i915: Add Guc/HuC firmware details to error state)
> > Cc: Vinay Belgaumkar 
> > Cc: Michal Wajdeczko 
> > Cc: Chris Wilson 
> > Signed-off-by: Daniele Ceraolo Spurio 
> > Reviewed-by: Chris Wilson  #v1
> Reviewed-by: Chris Wilson 

Picked up for dinq. Bah, should have applied this patch first for the
bugfix before the refactoring. My fault for remembering too late.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH v2 3/3] drm/i915/error: capture uc_state after gen_state

2018-03-05 Thread Daniele Ceraolo Spurio
error->device_info.has_guc, which we check in capture_uc_state, is set
in capture_gen_state, so the latter needs to be performed first.

v2: rebased

Reported-by: Vinay Belgaumkar 
Fixes: 7d41ef3479a6 (drm/i915: Add Guc/HuC firmware details to error state)
Cc: Vinay Belgaumkar 
Cc: Michal Wajdeczko 
Cc: Chris Wilson 
Signed-off-by: Daniele Ceraolo Spurio 
Reviewed-by: Chris Wilson  #v1
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 9afb1b9674c0..9e5e9547adb2 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1743,8 +1743,8 @@ static int capture(void *data)
  error->i915->gt.last_init_time);
 
capture_params(error);
-   capture_uc_state(error);
capture_gen_state(error);
+   capture_uc_state(error);
capture_reg_state(error);
gem_record_fences(error);
gem_record_rings(error);
-- 
2.16.2

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