[PATCH] drm/amd/amdgpu: Support VM environments in amdgpu_ttm_access_memory()

[Tom St Denis]

Ok done.

Cheers,
Tom

On 14/09/17 09:06 AM, Deucher, Alexander wrote:
> Please push to amd-staging-drm-next
> 
>> -----Original Message-----
>> From: StDenis, Tom
>> Sent: Thursday, September 14, 2017 9:05 AM
>> To: Deucher, Alexander; amd-gfx at lists.freedesktop.org
>> Subject: Re: [PATCH] drm/amd/amdgpu: Support VM environments in
>> amdgpu_ttm_access_memory()
>>
>> Pushed to stg-4.13.  Should I push to 4.12 too for the time being?
>>
>> Tom
>>
>> On 14/09/17 09:03 AM, Deucher, Alexander wrote:
>>>> -----Original Message-----
>>>> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On
>> Behalf
>>>> Of Tom St Denis
>>>> Sent: Thursday, September 14, 2017 8:59 AM
>>>> To: amd-gfx at lists.freedesktop.org
>>>> Cc: StDenis, Tom
>>>> Subject: [PATCH] drm/amd/amdgpu: Support VM environments in
>>>> amdgpu_ttm_access_memory()
>>>>
>>>> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
>>>
>>> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
>>>
>>>> ---
>>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++----
>>>>    1 file changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>>> index b2b11e176667..8ee16dfdb8af 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>>> @@ -1201,14 +1201,14 @@ static int amdgpu_ttm_access_memory(struct
>>>> ttm_buffer_object *bo,
>>>>    		}
>>>>
>>>>    		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
>>>> -		WREG32(mmMM_INDEX, ((uint32_t)aligned_pos) |
>>>> 0x80000000);
>>>> -		WREG32(mmMM_INDEX_HI, aligned_pos >> 31);
>>>> +		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)aligned_pos) |
>>>> 0x80000000);
>>>> +		WREG32_NO_KIQ(mmMM_INDEX_HI, aligned_pos >> 31);
>>>>    		if (!write || mask != 0xffffffff)
>>>> -			value = RREG32(mmMM_DATA);
>>>> +			value = RREG32_NO_KIQ(mmMM_DATA);
>>>>    		if (write) {
>>>>    			value &= ~mask;
>>>>    			value |= (*(uint32_t *)buf << shift) & mask;
>>>> -			WREG32(mmMM_DATA, value);
>>>> +			WREG32_NO_KIQ(mmMM_DATA, value);
>>>>    		}
>>>>    		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
>>>>    		if (!write) {
>>>> --
>>>> 2.12.0
>>>>
>>>> _______________________________________________
>>>> amd-gfx mailing list
>>>> amd-gfx at lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>