diff options
author | Flora Cui <Flora.Cui@amd.com> | 2016-08-18 01:18:09 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-19 12:32:38 -0400 |
commit | 27798e07ed9a8e9ae8d71c7a2b0ec3f313076cb8 (patch) | |
tree | 53377e7262e24cf0c25d09bdf7bc1187fd66044d /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
parent | 32ab75f076ac14a9b2e2e4d0910ecfb102ba9747 (diff) |
drm/amdgpu: use domain's gpu_offset for start addr
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Ken Wang <Qingqing.Wang@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_object.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index dbab3c0d096d..2c08e1b38656 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |||
@@ -530,11 +530,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, | |||
530 | *gpu_addr = amdgpu_bo_gpu_offset(bo); | 530 | *gpu_addr = amdgpu_bo_gpu_offset(bo); |
531 | 531 | ||
532 | if (max_offset != 0) { | 532 | if (max_offset != 0) { |
533 | u64 domain_start; | 533 | u64 domain_start = bo->tbo.bdev->man[mem_type].gpu_offset; |
534 | if (domain == AMDGPU_GEM_DOMAIN_VRAM) | ||
535 | domain_start = bo->adev->mc.vram_start; | ||
536 | else | ||
537 | domain_start = bo->adev->mc.gtt_start; | ||
538 | WARN_ON_ONCE(max_offset < | 534 | WARN_ON_ONCE(max_offset < |
539 | (amdgpu_bo_gpu_offset(bo) - domain_start)); | 535 | (amdgpu_bo_gpu_offset(bo) - domain_start)); |
540 | } | 536 | } |