Unverified Commit 7b1e9089 authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Rodrigo Vivi
Browse files

drm/xe/query: Update handling of xe_force_wake_get return 



With xe_force_wake_get() now returning the refcount-incremented
domain mask, a non-zero return value in the case of XE_FORCEWAKE_ALL
does not necessarily indicate success. Use xe_force_wake_ref_has_domain()
to determine the status of the call.

Modify the return handling of xe_force_wake_get() accordingly and
pass the return value to xe_force_wake_put().

v3
- return xe_wakeref_t instead of int in xe_force_wake_get()
- xe_force_wake_put() error doesn't need to be checked. It internally
WARNS on domain ack failure.

v5
- return unsigned int from xe_force_wake_get()

v6
- Use helper Use xe_force_wake_ref_has_domain()

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarBadal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-23-himal.prasad.ghimiray@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3bb5d1f0

drivers/gpu/drm/xe/xe_query.c

+6 −2
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ query_engine_cycles(struct xe_device *xe, 
	__ktime_func_t cpu_clock;

	struct xe_hw_engine *hwe;

	struct xe_gt *gt;

	unsigned int fw_ref;



	if (query->size == 0) {

		query->size = size;
@@ -149,13 +150,16 @@ query_engine_cycles(struct xe_device *xe, 
	if (!hwe)

		return -EINVAL;



	if (xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL))

	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL))  {

		xe_force_wake_put(gt_to_fw(gt), fw_ref);

		return -EIO;

	}



	hwe_read_timestamp(hwe, &resp.engine_cycles, &resp.cpu_timestamp,

			   &resp.cpu_delta, cpu_clock);



	xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);



	if (GRAPHICS_VER(xe) >= 20)

		resp.width = 64;