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

Commit 0e9a860c authored by Yong Zhao's avatar Yong Zhao Committed by Oded Gabbay
Browse files

drm/amdkfd: Introduce KFD module parameter halt_if_hws_hang 



This avoids triggering a GPU reset or otherwise changing the HW
state. Instead KFD will hang, which allows HW debugging tools to
analyze the problem.

Signed-off-by: default avatarYong Zhao <yong.zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent a29ec470

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+7 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,13 @@ int amdkfd_fence_wait_timeout(unsigned int *fence_addr, 
	while (*fence_addr != fence_value) {

		if (time_after(jiffies, end_jiffies)) {

			pr_err("qcm fence wait loop timeout expired\n");

			/* In HWS case, this is used to halt the driver thread

			 * in order not to mess up CP states before doing

			 * scandumps for FW debugging.

			 */

			while (halt_if_hws_hang)

				schedule();



			return -ETIME;

		}

		schedule();

drivers/gpu/drm/amd/amdkfd/kfd_module.c

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ MODULE_PARM_DESC(noretry, 


static int amdkfd_init_completed;



int halt_if_hws_hang;

module_param(halt_if_hws_hang, int, 0644);

MODULE_PARM_DESC(halt_if_hws_hang, "Halt if HWS hang is detected (0 = off (default), 1 = on)");



int kgd2kfd_init(unsigned int interface_version,

		const struct kgd2kfd_calls **g2f)

{

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+5 −0
Original line number Diff line number Diff line
@@ -144,6 +144,11 @@ extern int ignore_crat; 
 */

extern int vega10_noretry;



/*

 * Halt if HWS hang is detected

 */

extern int halt_if_hws_hang;



/**

 * enum kfd_sched_policy

 *