[v2,3/3] drm/i915/error: capture uc_state after gen_state
diff mbox

Message ID 20180305222122.3547-3-daniele.ceraolospurio@intel.com
State New
Headers show

Commit Message

Daniele Ceraolo Spurio March 5, 2018, 10:21 p.m. UTC
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 <vinay.belgaumkar@intel.com>
Fixes: 7d41ef3479a6 (drm/i915: Add Guc/HuC firmware details to error state)
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson March 6, 2018, 9:23 a.m. UTC | #1
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 <vinay.belgaumkar@intel.com>
> Fixes: 7d41ef3479a6 (drm/i915: Add Guc/HuC firmware details to error state)
> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Chris Wilson March 6, 2018, 9:36 a.m. UTC | #2
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 <vinay.belgaumkar@intel.com>
> > Fixes: 7d41ef3479a6 (drm/i915: Add Guc/HuC firmware details to error state)
> > Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Picked up for dinq. Bah, should have applied this patch first for the
bugfix before the refactoring. My fault for remembering too late.
-Chris

Patch
diff mbox

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);