Am 28.03.2017 um 17:31 schrieb Harry Wentland:
> Signed-off-by: Harry Wentland <harry.wentland at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 355e17ac6d27..dde1ecf87288 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -904,11 +904,12 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
> continue;
>
> if (chunk_ib->ip_type == AMDGPU_HW_IP_GFX && amdgpu_sriov_vf(adev)) {
> - if (chunk_ib->flags & AMDGPU_IB_FLAG_PREEMPT)
> + if (chunk_ib->flags & AMDGPU_IB_FLAG_PREEMPT) {
> if (chunk_ib->flags & AMDGPU_IB_FLAG_CE)
> ce_preempt++;
> else
> de_preempt++;
> + }
>
> /* each GFX command submit allows 0 or 1 IB preemptible for CE & DE */
> if (ce_preempt > 1 || de_preempt > 1)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index bcb939220806..e382eb818f7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -172,7 +172,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
> if (ring->funcs->init_cond_exec)
> patch_offset = amdgpu_ring_init_cond_exec(ring);
>
> - if (ring->funcs->emit_hdp_flush
> + if (ring->funcs->emit_hdp_flush
> #ifdef CONFIG_X86_64
> && !(adev->flags & AMD_IS_APU)
> #endif
