[PATCH 1/2] Revert "drm/amdgpu: disable gpu-sched load balance for uvd"

[Nirmoy]

On 9/2/20 8:55 AM, Christian König wrote:
> Am 01.09.20 um 21:49 schrieb Nirmoy Das:
>> This reverts commit e0300ed8820d19fe108006cf1b69fa26f0b4e3fc.
>>
>> We should also disable load balance for AMDGPU_HW_IP_UVD_ENC jobs.
>
> Well revert and re-apply is usually not the best option. Just provide 
> a delta patch and Alex might decide to squash it into the original one 
> during upstreaming.


I wasn't sure how to handle that. Thanks,  I will send a delta patch.


Regards,

Nirmoy


>
> Christian.
>
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
>> index 7cd398d25498..59032c26fc82 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
>> @@ -114,9 +114,7 @@ static int amdgpu_ctx_init_entity(struct 
>> amdgpu_ctx *ctx, u32 hw_ip,
>>       scheds = adev->gpu_sched[hw_ip][hw_prio].sched;
>>       num_scheds = adev->gpu_sched[hw_ip][hw_prio].num_scheds;
>>   -    if (hw_ip == AMDGPU_HW_IP_VCN_ENC ||
>> -        hw_ip == AMDGPU_HW_IP_VCN_DEC ||
>> -        hw_ip == AMDGPU_HW_IP_UVD) {
>> +    if (hw_ip == AMDGPU_HW_IP_VCN_ENC || hw_ip == 
>> AMDGPU_HW_IP_VCN_DEC) {
>>           sched = drm_sched_pick_best(scheds, num_scheds);
>>           scheds = &sched;
>>           num_scheds = 1;
>