| Message ID | 20180302191930.15236-3-daniele.ceraolospurio@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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 >
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);
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(-)