Commit 28a5d7a5 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: correct default gfx wdt timeout setting 



When gfx wdt was configured to fatal_disable, the
timeout period should be configured to 0x0 (timeout
disabled)

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarDennis Li <Dennis.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 20161e51

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ uint amdgpu_ras_mask = 0xffffffff; 
int amdgpu_bad_page_threshold = -1;

struct amdgpu_watchdog_timer amdgpu_watchdog_timer = {

	.timeout_fatal_disable = false,

	.period = 0x23, /* default to max. timeout = 1 << 0x23 cycles */

	.period = 0x0, /* default to 0x0 (timeout disable) */

};



/**
@@ -553,7 +553,7 @@ module_param_named(timeout_fatal_disable, amdgpu_watchdog_timer.timeout_fatal_di 
 * DOC: timeout_period (uint)

 * Modify the watchdog timeout max_cycles as (1 << period)

 */

MODULE_PARM_DESC(timeout_period, "watchdog timeout period (1 to 0x23(default), timeout maxCycles = (1 << period)");

MODULE_PARM_DESC(timeout_period, "watchdog timeout period (0 = timeout disabled, 1 ~ 0x23 = timeout maxcycles = (1 << period)");

module_param_named(timeout_period, amdgpu_watchdog_timer.period, uint, 0644);



/**