Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cab0b8d5 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdgpu: Change GART offset to 64-bit 



The GART aperture size can be bigger than 4GB. Therefore the offset
used in amdgpu_gart_bind and amdgpu_gart_unbind must be 64-bit.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 93b1f145

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −2
Original line number Diff line number Diff line
@@ -646,9 +646,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, uint64_t offset,

			int pages);

int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset,

int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr, uint32_t flags);

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ 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, uint64_t offset,

			int pages)

{

	unsigned t;
@@ -268,7 +268,7 @@ 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, uint64_t offset,

		     int pages, struct page **pagelist, dma_addr_t *dma_addr,

		     uint32_t flags)

{