diff options
author | Junwei Zhang <Jerry.Zhang@amd.com> | 2018-06-25 00:51:14 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-07-10 15:15:39 -0400 |
commit | 7b7c6c81b3a370b46b0c48f4ab7ac3be83237a12 (patch) | |
tree | dd93e3098cbcce0051433e3a173c466dd241ddbf /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |
parent | b861686b18538eaaf3530255eb37b4133146fbe2 (diff) |
drm/amdgpu: separate gpu address from bo pin
It could be got by amdgpu_bo_gpu_offset() if need
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@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_gart.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index 36113cb60ca2..a54d5655a191 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |||
@@ -143,14 +143,12 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) | |||
143 | */ | 143 | */ |
144 | int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) | 144 | int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) |
145 | { | 145 | { |
146 | uint64_t gpu_addr; | ||
147 | int r; | 146 | int r; |
148 | 147 | ||
149 | r = amdgpu_bo_reserve(adev->gart.robj, false); | 148 | r = amdgpu_bo_reserve(adev->gart.robj, false); |
150 | if (unlikely(r != 0)) | 149 | if (unlikely(r != 0)) |
151 | return r; | 150 | return r; |
152 | r = amdgpu_bo_pin(adev->gart.robj, | 151 | r = amdgpu_bo_pin(adev->gart.robj, AMDGPU_GEM_DOMAIN_VRAM); |
153 | AMDGPU_GEM_DOMAIN_VRAM, &gpu_addr); | ||
154 | if (r) { | 152 | if (r) { |
155 | amdgpu_bo_unreserve(adev->gart.robj); | 153 | amdgpu_bo_unreserve(adev->gart.robj); |
156 | return r; | 154 | return r; |
@@ -159,7 +157,7 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev) | |||
159 | if (r) | 157 | if (r) |
160 | amdgpu_bo_unpin(adev->gart.robj); | 158 | amdgpu_bo_unpin(adev->gart.robj); |
161 | amdgpu_bo_unreserve(adev->gart.robj); | 159 | amdgpu_bo_unreserve(adev->gart.robj); |
162 | adev->gart.table_addr = gpu_addr; | 160 | adev->gart.table_addr = amdgpu_bo_gpu_offset(adev->gart.robj); |
163 | return r; | 161 | return r; |
164 | } | 162 | } |
165 | 163 | ||