Commit 1b9d17db authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: fallback to generic HDP operation 



When ring special operations aren't available we can fallback to the
generic ASIC operations.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 69882565

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+14 −8
Original line number Diff line number Diff line
@@ -184,12 +184,15 @@ 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

#ifdef CONFIG_X86_64

	    && !(adev->flags & AMD_IS_APU)

	if (!(adev->flags & AMD_IS_APU))

#endif

	   )

	{

		if (ring->funcs->emit_hdp_flush)

			amdgpu_ring_emit_hdp_flush(ring);

		else

			amdgpu_asic_flush_hdp(adev, ring);

	}



	skip_preamble = ring->current_ctx == fence_ctx;

	need_ctx_switch = ring->current_ctx != fence_ctx;
@@ -219,12 +222,15 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (ring->funcs->emit_tmz)

		amdgpu_ring_emit_tmz(ring, false);



	if (ring->funcs->emit_hdp_invalidate

#ifdef CONFIG_X86_64

	    && !(adev->flags & AMD_IS_APU)

	if (!(adev->flags & AMD_IS_APU))

#endif

	   )

	{

		if (ring->funcs->emit_hdp_invalidate)

			amdgpu_ring_emit_hdp_invalidate(ring);

		else

			amdgpu_asic_invalidate_hdp(adev, ring);

	}



	r = amdgpu_fence_emit(ring, f);

	if (r) {