Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc62d0b authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/error: capture uc_state after gen_state 



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: default avatarVinay Belgaumkar <vinay.belgaumkar@intel.com>
Fixes: 7d41ef34 (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: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180305222122.3547-3-daniele.ceraolospurio@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 53b725c7

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −1
Original line number Diff line number Diff line
@@ -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);