diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-04-16 07:03:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-04-16 07:03:58 +0200 |
| commit | 06e09002bc1d46505d6b3bd947ebaf3cec7acab8 (patch) | |
| tree | da8b8a243b23ed3e5d9d790878924d65bc463b14 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90 (diff) | |
| parent | 1a1d569a75f3ab2923cb62daf356d102e4df2b86 (diff) | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6d83ccfa42ee..2c04ae133848 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -353,7 +353,6 @@ enum amdgpu_kiq_irq { AMDGPU_CP_KIQ_IRQ_DRIVER0 = 0, AMDGPU_CP_KIQ_IRQ_LAST }; -#define SRIOV_USEC_TIMEOUT 1200000 /* wait 12 * 100ms for SRIOV */ #define MAX_KIQ_REG_WAIT 5000 /* in usecs, 5ms */ #define MAX_KIQ_REG_BAILOUT_INTERVAL 5 /* in msecs, 5ms */ #define MAX_KIQ_REG_TRY 1000 |