[PATCH 3/3] drm/radeon: optimize CIK VM handling

[Alex Deucher]

On Tue, May 27, 2014 at 1:36 PM, Christian König
<deathsimple at vodafone.de> wrote:
> Am 27.05.2014 17:44, schrieb Alex Deucher:
>
>> On Tue, May 27, 2014 at 10:47 AM, Christian König
>> <deathsimple at vodafone.de> wrote:
>>>
>>> From: Christian König <christian.koenig at amd.com>
>>>
>>> Fill VM page tables from the GART page table if applicable.
>>>
>>> Signed-off-by: Christian König <christian.koenig at amd.com>
>>> ---
>>>   drivers/gpu/drm/radeon/cik_sdma.c | 21 ++++++++++++++++++++-
>>>   1 file changed, 20 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/cik_sdma.c
>>> b/drivers/gpu/drm/radeon/cik_sdma.c
>>> index f7e46cf..5bd3fe8 100644
>>> --- a/drivers/gpu/drm/radeon/cik_sdma.c
>>> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
>>> @@ -741,7 +741,26 @@ void cik_sdma_vm_set_page(struct radeon_device
>>> *rdev,
>>>
>>>          trace_radeon_vm_set_page(pe, addr, count, incr, flags);
>>>
>>> -       if (flags & R600_PTE_SYSTEM) {
>>> +       if (flags == R600_PTE_GART) {
>>> +               uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8;
>>> +               while (count) {
>>> +                       unsigned bytes = count * 8;
>>> +                       if (bytes > 0x1FFFF8)
>>> +                               bytes = 0x1FFFF8;
>>> +
>>> +                       ib->ptr[ib->length_dw++] =
>>> SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
>>
>>
>> Copy paste typo?  This should be SDMA_OPCODE_COPY,
>> SDMA_COPY_SUB_OPCODE_LINEAR.
>
>
> Oh, yes indeed. Thanks for the info.
>
> Going to resend this patch in a minute. Can you add them to your 3.16-wip
> branch?

Will do.

Alex

>
> Thanks,
> Christian.
>
>
>>
>> With that fixed, this patch is:
>>
>> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
>>
>>> +                       ib->ptr[ib->length_dw++] = bytes;
>>> +                       ib->ptr[ib->length_dw++] = 0; /* src/dst endian
>>> swap */
>>> +                       ib->ptr[ib->length_dw++] = src & 0xffffffff;
>>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(src);
>>> +                       ib->ptr[ib->length_dw++] = pe & 0xffffffff;
>>> +                       ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>>> +
>>> +                       pe += bytes;
>>> +                       src += bytes;
>>> +                       count -= bytes / 8;
>>> +               }
>>> +       } else if (flags & R600_PTE_SYSTEM) {
>>>                  while (count) {
>>>                          ndw = count * 2;
>>>                          if (ndw > 0xFFFFE)
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>