]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: disable gpu_sched load balancer for vcn jobs
authorNirmoy Das <nirmoy.das@amd.com>
Fri, 13 Mar 2020 14:26:54 +0000 (15:26 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 16 Mar 2020 20:21:32 +0000 (16:21 -0400)
VCN HW doesn't support dynamic load balance on multiple instances
for a context. This patch initializes VNC entities with only one
drm_gpu_scheduler picked by drm_sched_pick_best(). Picking a
drm_gpu_scheduler using drm_sched_pick_best() ensures that we
do load balance among multiple contexts but not among multiple
jobs in a context.

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

index 74c795a5e1873a9f07e5486d39719271dafd1a51..6ed36a2c5f73f2e89654d34b3cdbd9444c0c0270 100644 (file)
@@ -121,12 +121,16 @@ static int amdgpu_ctx_init_entity(struct amdgpu_ctx *ctx, const u32 hw_ip, const
                num_scheds = 1;
                break;
        case AMDGPU_HW_IP_VCN_DEC:
-               scheds = adev->vcn.vcn_dec_sched;
-               num_scheds =  adev->vcn.num_vcn_dec_sched;
+               sched = drm_sched_pick_best(adev->vcn.vcn_dec_sched,
+                                           adev->vcn.num_vcn_dec_sched);
+               scheds = &sched;
+               num_scheds = 1;
                break;
        case AMDGPU_HW_IP_VCN_ENC:
-               scheds = adev->vcn.vcn_enc_sched;
-               num_scheds =  adev->vcn.num_vcn_enc_sched;
+               sched = drm_sched_pick_best(adev->vcn.vcn_enc_sched,
+                                           adev->vcn.num_vcn_enc_sched);
+               scheds = &sched;
+               num_scheds = 1;
                break;
        case AMDGPU_HW_IP_VCN_JPEG:
                scheds = adev->jpeg.jpeg_sched;