[PATCH 05/10] drm/amdgpu: remove SRIOV and MCBP dependencies from the CS

[Christian König]

We should not have any different CS constrains based
on the execution environment.

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index b9de631a66a3..dfb7b4f46bc3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -323,8 +323,7 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p,
                return -EINVAL;
 
        if (chunk_ib->ip_type == AMDGPU_HW_IP_GFX &&
-           chunk_ib->flags & AMDGPU_IB_FLAG_PREEMPT &&
-           (amdgpu_mcbp || amdgpu_sriov_vf(p->adev))) {
+           chunk_ib->flags & AMDGPU_IB_FLAG_PREEMPT) {
                if (chunk_ib->flags & AMDGPU_IB_FLAG_CE)
                        (*ce_preempt)++;
                else
@@ -1084,7 +1083,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser 
*p)
        if (r)
                return r;
 
-       if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
+       if (fpriv->csa_va) {
                bo_va = fpriv->csa_va;
                r = amdgpu_vm_bo_update(adev, bo_va, false);
                if (r)
-- 
2.25.1