[PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2)

[Zhang, Jerry (Junwei)]

On 03/29/2017 11:24 PM, Deucher, Alexander wrote:
>> -----Original Message-----
>> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
>> Of Junwei Zhang
>> Sent: Wednesday, March 29, 2017 3:19 AM
>> To: amd-gfx at lists.freedesktop.org
>> Cc: Zhang, Jerry
>> Subject: [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2)
>>
>> v2: fix for all sdma engines
>
> What about cik_sdma.c and si_dma.c?

Errr, missed that.
I will fix it in another patch.
Please squash them together for upstream if possible.

Jerry

>
> Alex
>
>>
>> Change-Id: I15f8f429009058ba36c7340031c9fa178d716aef
>> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 ++--
>>  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 ++--
>>  drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++--
>>  3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> index bcc14ed..702fa5f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>> @@ -804,8 +804,8 @@ static void sdma_v2_4_vm_set_pte_pde(struct
>> amdgpu_ib *ib, uint64_t pe,
>>        ib->ptr[ib->length_dw++] =
>> SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>> -     ib->ptr[ib->length_dw++] = flags; /* mask */
>> -     ib->ptr[ib->length_dw++] = 0;
>> +     ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */
>> +     ib->ptr[ib->length_dw++] = upper_32_bits(flags);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(addr);
>>        ib->ptr[ib->length_dw++] = incr; /* increment size */
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> index 085cf63..cfd968e 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>> @@ -1013,8 +1013,8 @@ static void sdma_v3_0_vm_set_pte_pde(struct
>> amdgpu_ib *ib, uint64_t pe,
>>        ib->ptr[ib->length_dw++] =
>> SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>> -     ib->ptr[ib->length_dw++] = flags; /* mask */
>> -     ib->ptr[ib->length_dw++] = 0;
>> +     ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */
>> +     ib->ptr[ib->length_dw++] = upper_32_bits(flags);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(addr);
>>        ib->ptr[ib->length_dw++] = incr; /* increment size */
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> index dcbef50..6cfb100 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> @@ -968,8 +968,8 @@ static void sdma_v4_0_vm_set_pte_pde(struct
>> amdgpu_ib *ib,
>>        ib->ptr[ib->length_dw++] =
>> SDMA_PKT_HEADER_OP(SDMA_OP_PTEPDE);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(pe);
>> -     ib->ptr[ib->length_dw++] = flags; /* mask */
>> -     ib->ptr[ib->length_dw++] = 0;
>> +     ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */
>> +     ib->ptr[ib->length_dw++] = upper_32_bits(flags);
>>        ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */
>>        ib->ptr[ib->length_dw++] = upper_32_bits(addr);
>>        ib->ptr[ib->length_dw++] = incr; /* increment size */
>> --
>> 1.9.1
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>>https://lists.freedesktop.org/mailman/listinfo/amd-gfx