diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2021-10-18 00:27:15 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-10-19 16:53:30 +0000 |
| commit | 6129db68bf81ac72e72e3e39e574fe8f227d0f0b (patch) | |
| tree | e8ccc497d146dab886768e46955e2431c42803dc /src/gallium/winsys/amdgpu/drm | |
| parent | 9d852a4695263ece8f8fbd5edf79edc272b1f41e (diff) | |
winsys/amdgpu: remove force_chaining parameter from cs_check_space
it's always false
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13400>
Diffstat (limited to 'src/gallium/winsys/amdgpu/drm')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 6452d2ba4a8..a60c1225b14 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -1070,8 +1070,7 @@ static bool amdgpu_cs_validate(struct radeon_cmdbuf *rcs) return true; } -static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw, - bool force_chaining) +static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw) { struct amdgpu_cs *cs = amdgpu_cs(rcs); struct amdgpu_ib *ib = &cs->main; @@ -1085,23 +1084,18 @@ static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw, ib->max_check_space_size = MAX2(ib->max_check_space_size, safe_byte_size); - /* If force_chaining is true, we can't return. We have to chain. */ - if (!force_chaining) { - unsigned requested_size = rcs->prev_dw + rcs->current.cdw + dw; + unsigned requested_size = rcs->prev_dw + rcs->current.cdw + dw; - if (requested_size > IB_MAX_SUBMIT_DWORDS) - return false; + if (requested_size > IB_MAX_SUBMIT_DWORDS) + return false; - ib->max_ib_size = MAX2(ib->max_ib_size, requested_size); + ib->max_ib_size = MAX2(ib->max_ib_size, requested_size); - if (rcs->current.max_dw - rcs->current.cdw >= dw) - return true; - } + if (rcs->current.max_dw - rcs->current.cdw >= dw) + return true; - if (!cs->has_chaining) { - assert(!force_chaining); + if (!cs->has_chaining) return false; - } /* Allocate a new chunk */ if (rcs->num_prev >= rcs->max_prev) { |