aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
diff options
context:
space:
mode:
authorJiadong Zhu <Jiadong.Zhu@amd.com>2023-08-08 10:59:25 +0800
committerAlex Deucher <alexander.deucher@amd.com>2023-08-15 17:44:02 -0400
commit1e9e15dcf414bef97489573e3521589b692f7231 (patch)
treeb731e727ddff1cdc3d8e6ef1d9bc77a4480dbba9 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
parentba4c1d772c26ee91ea308c1b68f4f58a38de2aa5 (diff)
downloadlinux-1e9e15dcf414bef97489573e3521589b692f7231.tar.gz
linux-1e9e15dcf414bef97489573e3521589b692f7231.tar.bz2
linux-1e9e15dcf414bef97489573e3521589b692f7231.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 <Jiadong.Zhu@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c2
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;