Commit 14a8032a authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu: don't use MM idle_work for SRIOV(v2) 



SRIOV doesn't give VF cg/pg feature so the MM's idle_work
is skipped for SR-IOV

v2:
remove superfluous changes
since idle_work is not scheduled for SR-IOV so the condition
check for SR-IOV inside idle_work also can be dropped

v3:
drop the SRIOV check in amdgpu_vce/uvd_suspend

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63b2b08b

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

+4 −5
Original line number Diff line number Diff line
@@ -1116,9 +1116,6 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work) 
		container_of(work, struct amdgpu_device, uvd.idle_work.work);

	unsigned fences = amdgpu_fence_count_emitted(&adev->uvd.ring);



	if (amdgpu_sriov_vf(adev))

		return;



	if (fences == 0) {

		if (adev->pm.dpm_enabled) {

			amdgpu_dpm_enable_uvd(adev, false);
@@ -1138,11 +1135,12 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work) 
void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	bool set_clocks = !cancel_delayed_work_sync(&adev->uvd.idle_work);

	bool set_clocks;



	if (amdgpu_sriov_vf(adev))

		return;



	set_clocks = !cancel_delayed_work_sync(&adev->uvd.idle_work);

	if (set_clocks) {

		if (adev->pm.dpm_enabled) {

			amdgpu_dpm_enable_uvd(adev, true);
@@ -1158,6 +1156,7 @@ void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring) 


void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring)

{

	if (!amdgpu_sriov_vf(ring->adev))

		schedule_delayed_work(&ring->adev->uvd.idle_work, UVD_IDLE_TIMEOUT);

}

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

+2 −4
Original line number Diff line number Diff line
@@ -300,9 +300,6 @@ static void amdgpu_vce_idle_work_handler(struct work_struct *work) 
		container_of(work, struct amdgpu_device, vce.idle_work.work);

	unsigned i, count = 0;



	if (amdgpu_sriov_vf(adev))

		return;



	for (i = 0; i < adev->vce.num_rings; i++)

		count += amdgpu_fence_count_emitted(&adev->vce.ring[i]);
@@ -362,6 +359,7 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring) 
 */

void amdgpu_vce_ring_end_use(struct amdgpu_ring *ring)

{

	if (!amdgpu_sriov_vf(ring->adev))

		schedule_delayed_work(&ring->adev->vce.idle_work, VCE_IDLE_TIMEOUT);

}