Commit cf606729 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: enable mes to access registers v2 



Enable mes to access registers.

v2: squash mes sched ring enablement flag

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent adc0e6ab

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

+8 −0
Original line number Diff line number Diff line
@@ -699,6 +699,9 @@ uint32_t amdgpu_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) 
	if (amdgpu_device_skip_hw_access(adev))

		return 0;



	if (adev->mes.ring.sched.ready)

		return amdgpu_mes_rreg(adev, reg);



	BUG_ON(!ring->funcs->emit_rreg);



	spin_lock_irqsave(&kiq->ring_lock, flags);
@@ -766,6 +769,11 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v) 
	if (amdgpu_device_skip_hw_access(adev))

		return;



	if (adev->mes.ring.sched.ready) {

		amdgpu_mes_wreg(adev, reg, v);

		return;

	}



	spin_lock_irqsave(&kiq->ring_lock, flags);

	amdgpu_ring_alloc(ring, 32);

	amdgpu_ring_emit_wreg(ring, reg, v);

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

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ void amdgpu_virt_kiq_reg_write_reg_wait(struct amdgpu_device *adev, 
	unsigned long flags;

	uint32_t seq;



	if (adev->mes.ring.sched.ready) {

		amdgpu_mes_reg_write_reg_wait(adev, reg0, reg1,

					      ref, mask);

		return;

	}



	spin_lock_irqsave(&kiq->ring_lock, flags);

	amdgpu_ring_alloc(ring, 32);

	amdgpu_ring_emit_reg_write_reg_wait(ring, reg0, reg1,

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

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void gmc_v11_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
	/* For SRIOV run time, driver shouldn't access the register through MMIO

	 * Directly use kiq to do the vm invalidation instead

	 */

	if (adev->gfx.kiq.ring.sched.ready && !adev->enable_mes &&

	if ((adev->gfx.kiq.ring.sched.ready || adev->mes.ring.sched.ready) &&

	    (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev))) {

		struct amdgpu_vmhub *hub = &adev->vmhub[vmhub];

		const unsigned eng = 17;

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

+1 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,7 @@ static int mes_v11_0_hw_init(void *handle) 
	 * with MES enabled.

	 */

	adev->gfx.kiq.ring.sched.ready = false;

	adev->mes.ring.sched.ready = true;



	return 0;