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

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

Commit Message

Daniele Ceraolo Spurio March 2, 2018, 7:19 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.

Reported-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
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>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson March 3, 2018, 9:55 a.m. UTC | #1
Quoting Daniele Ceraolo Spurio (2018-03-02 19:19:30)
> 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.
> 
> Reported-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
> 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>

Care to add a fixes in case you want this backported?

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Daniele Ceraolo Spurio March 5, 2018, 10:16 p.m. UTC | #2
On 03/03/18 01:55, Chris Wilson wrote:
> Quoting Daniele Ceraolo Spurio (2018-03-02 19:19:30)
>> 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.
>>
>> Reported-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
>> 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>
> 
> Care to add a fixes in case you want this backported?
> 

I had purposely omitted the tag as I thought that since GuC is disabled 
by default we wouldn't backport patches related to it, but I guess I had 
the wrong idea :)
I'll add the tag in v2

Thanks,
Daniele

> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -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 d1f96e6a723a..e39f2bd4c2ab 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1749,9 +1749,9 @@  static int capture(void *data)
 				  error->i915->gt.last_init_time);
 
 	capture_params(error);
-	capture_uc_state(i915, error);
 
 	capture_gen_state(i915, error);
+	capture_uc_state(i915, error);
 	capture_reg_state(i915, error);
 	gem_record_fences(i915, error);
 	gem_record_rings(i915, error);