Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next

Fixes for 4.19:
- Fix UVD 7.2 instance handling
- Fix UVD 7.2 harvesting
- GPU scheduler fix for when a process is killed
- TTM cleanups
- amdgpu CS bo_list fixes
- Powerplay fixes for polaris12 and CZ/ST
- DC fixes for link training certain HMDs
- DC fix for vega10 blank screen in certain cases

From: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180801222906.1016-1-alexander.deucher@amd.com

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
index d8357290ad09..a172bba32b45 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
@@ -214,7 +214,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
                          u32 hw_ip, u32 instance, u32 ring,
                          struct amdgpu_ring **out_ring)
 {
-        int r, ip_num_rings;
+        int i, r, ip_num_rings = 0;
         struct amdgpu_queue_mapper *mapper = &mgr->mapper[hw_ip];
 
         if (!adev || !mgr || !out_ring)
@@ -243,14 +243,21 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
                 ip_num_rings = adev->sdma.num_instances;
                 break;
         case AMDGPU_HW_IP_UVD:
-                ip_num_rings = adev->uvd.num_uvd_inst;
+                for (i = 0; i < adev->uvd.num_uvd_inst; i++) {
+                        if (!(adev->uvd.harvest_config & (1 << i)))
+                                ip_num_rings++;
+                }
                 break;
         case AMDGPU_HW_IP_VCE:
                 ip_num_rings = adev->vce.num_rings;
                 break;
         case AMDGPU_HW_IP_UVD_ENC:
+                for (i = 0; i < adev->uvd.num_uvd_inst; i++) {
+                        if (!(adev->uvd.harvest_config & (1 << i)))
+                                ip_num_rings++;
+                }
                 ip_num_rings =
-                        adev->uvd.num_enc_rings * adev->uvd.num_uvd_inst;
+                        adev->uvd.num_enc_rings * ip_num_rings;
                 break;
         case AMDGPU_HW_IP_VCN_DEC:
                 ip_num_rings = 1;