* [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2)
@ 2017-03-29 7:19 Junwei Zhang
[not found] ` <1490771963-31598-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Junwei Zhang @ 2017-03-29 7:19 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Junwei Zhang
v2: fix for all sdma engines
Change-Id: I15f8f429009058ba36c7340031c9fa178d716aef
Signed-off-by: Junwei Zhang <Jerry.Zhang@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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <1490771963-31598-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2) [not found] ` <1490771963-31598-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org> @ 2017-03-29 7:20 ` Christian König 2017-03-29 15:24 ` Deucher, Alexander 1 sibling, 0 replies; 4+ messages in thread From: Christian König @ 2017-03-29 7:20 UTC (permalink / raw) To: Junwei Zhang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Am 29.03.2017 um 09:19 schrieb Junwei Zhang: > v2: fix for all sdma engines > > Change-Id: I15f8f429009058ba36c7340031c9fa178d716aef > Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> Reviewed-by: Christian König <christian.koenig@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 */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2) [not found] ` <1490771963-31598-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org> 2017-03-29 7:20 ` Christian König @ 2017-03-29 15:24 ` Deucher, Alexander [not found] ` <BN6PR12MB1652349B54D5658B4864EB17F7350-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 1 sibling, 1 reply; 4+ messages in thread From: Deucher, Alexander @ 2017-03-29 15:24 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; +Cc: Zhang, Jerry > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Junwei Zhang > Sent: Wednesday, March 29, 2017 3:19 AM > To: amd-gfx@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? Alex > > Change-Id: I15f8f429009058ba36c7340031c9fa178d716aef > Signed-off-by: Junwei Zhang <Jerry.Zhang@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@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <BN6PR12MB1652349B54D5658B4864EB17F7350-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* Re: [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2) [not found] ` <BN6PR12MB1652349B54D5658B4864EB17F7350-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2017-03-30 2:12 ` Zhang, Jerry (Junwei) 0 siblings, 0 replies; 4+ messages in thread From: Zhang, Jerry (Junwei) @ 2017-03-30 2:12 UTC (permalink / raw) To: Deucher, Alexander, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org On 03/29/2017 11:24 PM, Deucher, Alexander wrote: >> -----Original Message----- >> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf >> Of Junwei Zhang >> Sent: Wednesday, March 29, 2017 3:19 AM >> To: amd-gfx@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@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@lists.freedesktop.org >>https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-30 2:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29 7:19 [PATCH v2] drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v2) Junwei Zhang
[not found] ` <1490771963-31598-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
2017-03-29 7:20 ` Christian König
2017-03-29 15:24 ` Deucher, Alexander
[not found] ` <BN6PR12MB1652349B54D5658B4864EB17F7350-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-03-30 2:12 ` Zhang, Jerry (Junwei)
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.