diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
| commit | 5c0fc54c9b67e04d533b5ebec718d37f747a9170 (patch) | |
| tree | d84f18a4e233beca860dc416445160c847bb83cc /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | 18cb0eedcc22a6df7da9e106d0c8741e647e4f87 (diff) | |
| parent | 2cb99ded2f551c78506e5f7bbf6c0d7613351ab1 (diff) | |
Merge tag 'v4.4.20' into android-4.4.y
This is the 4.4.20 stable release
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 053fc2f465df..ff5566c69f7d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -710,9 +710,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); |