diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-12-09 05:08:32 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-12-09 05:08:33 +0300 |
| commit | 66efff515a6500d4b4976fbab3bee8b92a1137fb (patch) | |
| tree | 64368466dccca696a57300443e12d1f805f16c59 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | |
| parent | 9e5737bd0457955690d871b3f4fc66dea40ea141 (diff) | |
| parent | 347fafe0eb46df941965c355c77ce480e4d49f1f (diff) | |
| download | linux-66efff515a6500d4b4976fbab3bee8b92a1137fb.tar.xz | |
Merge tag 'amd-drm-next-6.2-2022-12-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.2-2022-12-07:
amdgpu:
- DSC fixes for DCN 2.1
- HDMI PCON fixes
- PSR fixes
- DC DML fixes
- Properly throttle on BO allocation
- GFX 11.0.4 fixes
- MMHUB fix
- Make some functions static
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221207232439.5908-1-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.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c index 3348337379da..62079f0e3ee8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c @@ -350,7 +350,7 @@ unsigned int amdgpu_sw_ring_priority(int idx) } /*Scan on low prio rings to have unsignaled fence and high ring has no fence.*/ -int amdgpu_mcbp_scan(struct amdgpu_ring_mux *mux) +static int amdgpu_mcbp_scan(struct amdgpu_ring_mux *mux) { struct amdgpu_ring *ring; int i, need_preempt; @@ -370,7 +370,7 @@ int amdgpu_mcbp_scan(struct amdgpu_ring_mux *mux) } /* Trigger Mid-Command Buffer Preemption (MCBP) and find if we need to resubmit. */ -int amdgpu_mcbp_trigger_preempt(struct amdgpu_ring_mux *mux) +static int amdgpu_mcbp_trigger_preempt(struct amdgpu_ring_mux *mux) { int r; @@ -434,7 +434,7 @@ void amdgpu_ring_mux_start_ib(struct amdgpu_ring_mux *mux, struct amdgpu_ring *r static void scan_and_remove_signaled_chunk(struct amdgpu_ring_mux *mux, struct amdgpu_ring *ring) { - uint32_t last_seq, size = 0; + uint32_t last_seq = 0; struct amdgpu_mux_entry *e; struct amdgpu_mux_chunk *chunk, *tmp; @@ -450,8 +450,6 @@ static void scan_and_remove_signaled_chunk(struct amdgpu_ring_mux *mux, struct a if (chunk->sync_seq <= last_seq) { list_del(&chunk->entry); kmem_cache_free(amdgpu_mux_chunk_slab, chunk); - } else { - size++; } } } |