diff options
| author | Jiadong Zhu <[email protected]> | 2023-08-08 02:59:25 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-08-16 19:46:33 +0000 |
| commit | 0d6f374c0c66e8ecc2897f0837d2cb4bd169bb42 (patch) | |
| tree | 3555ec7ff942f3cbc9564a04ffc455ff576311e1 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | |
| parent | drm/amd/pm: disallow the fan setting if there is no fan on smu 13.0.0 (diff) | |
| download | kernel-0d6f374c0c66e8ecc2897f0837d2cb4bd169bb42.tar.gz kernel-0d6f374c0c66e8ecc2897f0837d2cb4bd169bb42.zip | |
drm/amdgpu: disable mcbp if parameter zero is set
The parameter amdgpu_mcbp shall have priority against the default value
calculated from the chip version.
User could disable mcbp by setting the parameter mcbp as zero.
v2: do not trigger preemption in sw ring muxer when mcbp is disabled.
Signed-off-by: Jiadong Zhu <[email protected]>
Acked-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c index b779ee4bbaa7..e1ee1c7117fb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c @@ -397,7 +397,7 @@ void amdgpu_sw_ring_ib_begin(struct amdgpu_ring *ring) struct amdgpu_ring_mux *mux = &adev->gfx.muxer; WARN_ON(!ring->is_sw_ring); - if (ring->hw_prio > AMDGPU_RING_PRIO_DEFAULT) { + if (adev->gfx.mcbp && ring->hw_prio > AMDGPU_RING_PRIO_DEFAULT) { if (amdgpu_mcbp_scan(mux) > 0) amdgpu_mcbp_trigger_preempt(mux); return; |