Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Hawking Zhang and committed by
Alex Deucher
28a5d7a5 20161e51

+2 -2
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
··· 185 185 int amdgpu_bad_page_threshold = -1; 186 186 struct amdgpu_watchdog_timer amdgpu_watchdog_timer = { 187 187 .timeout_fatal_disable = false, 188 - .period = 0x23, /* default to max. timeout = 1 << 0x23 cycles */ 188 + .period = 0x0, /* default to 0x0 (timeout disable) */ 189 189 }; 190 190 191 191 /** ··· 553 553 * DOC: timeout_period (uint) 554 554 * Modify the watchdog timeout max_cycles as (1 << period) 555 555 */ 556 - MODULE_PARM_DESC(timeout_period, "watchdog timeout period (1 to 0x23(default), timeout maxCycles = (1 << period)"); 556 + MODULE_PARM_DESC(timeout_period, "watchdog timeout period (0 = timeout disabled, 1 ~ 0x23 = timeout maxcycles = (1 << period)"); 557 557 module_param_named(timeout_period, amdgpu_watchdog_timer.period, uint, 0644); 558 558 559 559 /**