[PATCH revert] Revert "drm/amdgpu: use GMC v9 KIQ workaround only for the GFXHUB"

[Christian König]

Am 16.11.18 um 09:23 schrieb Huang, Ray:
>> -----Original Message-----
>> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
>> Of Chengming Gui
>> Sent: Friday, November 16, 2018 4:21 PM
>> To: amd-gfx at lists.freedesktop.org
>> Cc: Gui, Jack <Jack.Gui at amd.com>
>> Subject: [PATCH revert] Revert "drm/amdgpu: use GMC v9 KIQ workaround
>> only for the GFXHUB"
>>
>> With GFXOFF enabled, this patch will cause PCO amdgpu_test failed, but
>> GFXOFF is necessary for PCO, so revert the patch.
>>
>> This reverts commit b83761bb0b09ec11c924afe9d88e458cb16a0372.
>> Signed-off-by: Jack Gui <Jack.Gui at amd.com>
> Reviewed-by: Huang Rui <ray.huang at amd.com>

Please add a comment like "/* This is necessary for a HW workaround 
under SRIOV as well as GFXOFF under bare metal */".

With that done the patch is Reviewed-by: Christian König 
<christian.koenig at amd.com> as well.

Thanks,
Christian.

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> index 811231e..14ca4d8 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>> @@ -338,9 +338,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct
>> amdgpu_device *adev,
>>   		struct amdgpu_vmhub *hub = &adev->vmhub[i];
>>   		u32 tmp = gmc_v9_0_get_invalidate_req(vmid, flush_type);
>>
>> -		if (i == AMDGPU_GFXHUB && !adev->in_gpu_reset &&
>> -		    adev->gfx.kiq.ring.sched.ready &&
>> -		    (amdgpu_sriov_runtime(adev)
>> || !amdgpu_sriov_vf(adev))) {
>> +		if (adev->gfx.kiq.ring.sched.ready &&
>> +		    (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev))
>> &&
>> +		    !adev->in_gpu_reset) {
>>   			uint32_t req = hub->vm_inv_eng0_req + eng;
>>   			uint32_t ack = hub->vm_inv_eng0_ack + eng;
>>
>> --
>> 2.7.4
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx