diff options
| author | Jani Nikula <[email protected]> | 2021-07-01 15:46:34 +0000 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2021-07-01 15:46:34 +0000 |
| commit | e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c (patch) | |
| tree | 4b1109adc051c943ef3edd990f5a907a0836bdf8 /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | |
| parent | drm/i915/display: Fix state mismatch in drm infoframe (diff) | |
| parent | Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/... (diff) | |
| download | kernel-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.tar.gz kernel-e42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c.zip | |
Merge drm/drm-next into drm-intel-next
Bring drm-intel-next closer to drm-next and drm-intel-gt-next for a more
feasible baseline for topic branches.
Signed-off-by: Jani Nikula <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h index a25fe97b0196..78895413cf9f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h @@ -57,14 +57,13 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev); 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_dummy_page_fini(struct amdgpu_device *adev); int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, int pages); int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, int pages, dma_addr_t *dma_addr, uint64_t flags, void *dst); int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, - int pages, struct page **pagelist, - dma_addr_t *dma_addr, uint64_t flags); - + int pages, dma_addr_t *dma_addr, uint64_t flags); +void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev); #endif |