* [PATCH] drm/amdgpu: gtt offset should be 64 bit
@ 2016-09-14 9:13 Flora Cui
[not found] ` <1473844418-22724-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Flora Cui @ 2016-09-14 9:13 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Flora Cui
Change-Id: I05618a472b1ebf381575d02e226264609bf4db7f
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 282e00d..f07f1c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -619,9 +619,9 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev);
void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);
int amdgpu_gart_init(struct amdgpu_device *adev);
void amdgpu_gart_fini(struct amdgpu_device *adev);
-void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset,
+void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset,
int pages);
-int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset,
+int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset,
int pages, struct page **pagelist,
dma_addr_t *dma_addr, uint32_t flags);
int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 921bce2..7968f77 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -221,11 +221,10 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev)
* Unbinds the requested pages from the gart page table and
* replaces them with the dummy page (all asics).
*/
-void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset,
+void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset,
int pages)
{
- unsigned t;
- unsigned p;
+ u64 t, p;
int i, j;
u64 page_base;
uint32_t flags = AMDGPU_PTE_SYSTEM;
@@ -268,12 +267,11 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset,
* (all asics).
* Returns 0 for success, -EINVAL for failure.
*/
-int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset,
+int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset,
int pages, struct page **pagelist, dma_addr_t *dma_addr,
uint32_t flags)
{
- unsigned t;
- unsigned p;
+ uint64_t t, p;
uint64_t page_base;
int i, j;
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <1473844418-22724-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: gtt offset should be 64 bit [not found] ` <1473844418-22724-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org> @ 2016-09-14 9:32 ` Christian König [not found] ` <4a840c0a-30bd-836d-7d50-8bc8c7565f4e-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Christian König @ 2016-09-14 9:32 UTC (permalink / raw) To: Flora Cui, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Am 14.09.2016 um 11:13 schrieb Flora Cui: > Change-Id: I05618a472b1ebf381575d02e226264609bf4db7f > Signed-off-by: Flora Cui <Flora.Cui@amd.com> Didn't Felix came up with the same patch a few weeks ago? Anyway the fix is clearly not committed. Patch is Reviewed-by: Christian König <christian.koenig@amd.com>. Regards, Christian. > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 10 ++++------ > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 282e00d..f07f1c9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -619,9 +619,9 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev); > void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev); > int amdgpu_gart_init(struct amdgpu_device *adev); > void amdgpu_gart_fini(struct amdgpu_device *adev); > -void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > +void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset, > int pages); > -int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, > +int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset, > int pages, struct page **pagelist, > dma_addr_t *dma_addr, uint32_t flags); > int amdgpu_ttm_recover_gart(struct amdgpu_device *adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > index 921bce2..7968f77 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > @@ -221,11 +221,10 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev) > * Unbinds the requested pages from the gart page table and > * replaces them with the dummy page (all asics). > */ > -void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > +void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset, > int pages) > { > - unsigned t; > - unsigned p; > + u64 t, p; > int i, j; > u64 page_base; > uint32_t flags = AMDGPU_PTE_SYSTEM; > @@ -268,12 +267,11 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > * (all asics). > * Returns 0 for success, -EINVAL for failure. > */ > -int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, > +int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset, > int pages, struct page **pagelist, dma_addr_t *dma_addr, > uint32_t flags) > { > - unsigned t; > - unsigned p; > + uint64_t t, p; > uint64_t page_base; > int i, j; > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <4a840c0a-30bd-836d-7d50-8bc8c7565f4e-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: gtt offset should be 64 bit [not found] ` <4a840c0a-30bd-836d-7d50-8bc8c7565f4e-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2016-09-14 9:43 ` Flora Cui 0 siblings, 0 replies; 3+ messages in thread From: Flora Cui @ 2016-09-14 9:43 UTC (permalink / raw) To: Christian König; +Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW yes. i just find it out. it's commit 9040cf0a in 4.6 branch yet not in 4.7. please ignore this commit. On Wed, Sep 14, 2016 at 11:32:32AM +0200, Christian König wrote: > Am 14.09.2016 um 11:13 schrieb Flora Cui: > >Change-Id: I05618a472b1ebf381575d02e226264609bf4db7f > >Signed-off-by: Flora Cui <Flora.Cui@amd.com> > > Didn't Felix came up with the same patch a few weeks ago? > > Anyway the fix is clearly not committed. Patch is Reviewed-by: Christian > König <christian.koenig@amd.com>. > > Regards, > Christian. > > >--- > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++-- > > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 10 ++++------ > > 2 files changed, 6 insertions(+), 8 deletions(-) > > > >diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > >index 282e00d..f07f1c9 100644 > >--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > >+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > >@@ -619,9 +619,9 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev); > > void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev); > > int amdgpu_gart_init(struct amdgpu_device *adev); > > void amdgpu_gart_fini(struct amdgpu_device *adev); > >-void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > >+void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset, > > int pages); > >-int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, > >+int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset, > > int pages, struct page **pagelist, > > dma_addr_t *dma_addr, uint32_t flags); > > int amdgpu_ttm_recover_gart(struct amdgpu_device *adev); > >diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > >index 921bce2..7968f77 100644 > >--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > >+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c > >@@ -221,11 +221,10 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev) > > * Unbinds the requested pages from the gart page table and > > * replaces them with the dummy page (all asics). > > */ > >-void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > >+void amdgpu_gart_unbind(struct amdgpu_device *adev, u64 offset, > > int pages) > > { > >- unsigned t; > >- unsigned p; > >+ u64 t, p; > > int i, j; > > u64 page_base; > > uint32_t flags = AMDGPU_PTE_SYSTEM; > >@@ -268,12 +267,11 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, > > * (all asics). > > * Returns 0 for success, -EINVAL for failure. > > */ > >-int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, > >+int amdgpu_gart_bind(struct amdgpu_device *adev, u64 offset, > > int pages, struct page **pagelist, dma_addr_t *dma_addr, > > uint32_t flags) > > { > >- unsigned t; > >- unsigned p; > >+ uint64_t t, p; > > uint64_t page_base; > > int i, j; > > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-14 9:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 9:13 [PATCH] drm/amdgpu: gtt offset should be 64 bit Flora Cui
[not found] ` <1473844418-22724-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org>
2016-09-14 9:32 ` Christian König
[not found] ` <4a840c0a-30bd-836d-7d50-8bc8c7565f4e-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2016-09-14 9:43 ` Flora Cui
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.