From: Monk Liu Date: Wed, 18 Jan 2017 02:37:34 +0000 (+0800) Subject: drm/amdgpu:Preamble is forbid to be ignored in SRIOV X-Git-Tag: MMI-PSA29.97-13-9~6111^2~31^2~28 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=79bbbf8bfe646d63a52dcb1f8272a27adbcae097;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/amdgpu:Preamble is forbid to be ignored in SRIOV SR-IOV requires the preamble. Signed-off-by: Monk Liu Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 38dded50ae8a..5329ac93e43d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c @@ -193,7 +193,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, /* drop preamble IBs if we don't have a context switch */ if ((ib->flags & AMDGPU_IB_FLAG_PREAMBLE) && skip_preamble && - !(status & AMDGPU_PREAMBLE_IB_PRESENT_FIRST)) + !(status & AMDGPU_PREAMBLE_IB_PRESENT_FIRST) && + !amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */ continue; amdgpu_ring_emit_ib(ring, ib, job ? job->vm_id : 0,