2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 913ce1cb0ea3..0b92dd0c1d70 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1138,6 +1138,9 @@ 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);
@@ -1159,6 +1162,9 @@ 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);
 
+        if (amdgpu_sriov_vf(adev))
+                return;
+
         if (set_clocks) {
                 if (adev->pm.dpm_enabled) {
                         amdgpu_dpm_enable_uvd(adev, true);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 199bc89a4d01..a76175a9f878 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -320,6 +320,9 @@ 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]);
 
@@ -350,6 +353,9 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring)
         struct amdgpu_device *adev = ring->adev;
         bool set_clocks;
 
+        if (amdgpu_sriov_vf(adev))
+                return;
+
         mutex_lock(&adev->vce.idle_mutex);
         set_clocks = !cancel_delayed_work_sync(&adev->vce.idle_work);
         if (set_clocks) {