diff options
author | Chunming Zhou <David1.Zhou@amd.com> | 2016-09-21 04:19:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:53:38 -0400 |
commit | 6b777607c1442857e160a57d02b9951d8e7639b4 (patch) | |
tree | a8ed750b2375e3a444b7ef45d8b2fbaff45823ff /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | 7ccf5aa8ba8241cba0f6a894ec1e68a2794cef6f (diff) |
drm/amdgpu: expand pte flags to uint64_t
Necessary for new asics.
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 4c6094eefc51..f2241bb67987 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -746,7 +746,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) | |||
746 | { | 746 | { |
747 | struct ttm_tt *ttm = bo->ttm; | 747 | struct ttm_tt *ttm = bo->ttm; |
748 | struct amdgpu_ttm_tt *gtt = (void *)bo->ttm; | 748 | struct amdgpu_ttm_tt *gtt = (void *)bo->ttm; |
749 | uint32_t flags; | 749 | uint64_t flags; |
750 | int r; | 750 | int r; |
751 | 751 | ||
752 | if (!ttm || amdgpu_ttm_is_bound(ttm)) | 752 | if (!ttm || amdgpu_ttm_is_bound(ttm)) |
@@ -1027,10 +1027,10 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm) | |||
1027 | return !!(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY); | 1027 | return !!(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY); |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, | 1030 | uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, |
1031 | struct ttm_mem_reg *mem) | 1031 | struct ttm_mem_reg *mem) |
1032 | { | 1032 | { |
1033 | uint32_t flags = 0; | 1033 | uint64_t flags = 0; |
1034 | 1034 | ||
1035 | if (mem && mem->mem_type != TTM_PL_SYSTEM) | 1035 | if (mem && mem->mem_type != TTM_PL_SYSTEM) |
1036 | flags |= AMDGPU_PTE_VALID; | 1036 | flags |= AMDGPU_PTE_VALID; |