diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
| commit | 7ec6a8dab8b257943b7711e8e87b8a8830b4f59e (patch) | |
| tree | 4c3c3a180f656fe32786a39ca7ac256141c2c874 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | e1ab74623721da21eee91cb22b5824aa7d0c0d5b (diff) | |
| parent | a874aba8bbc529517ed154d88b08e3c437564c88 (diff) | |
Merge remote-tracking branch 'drm_misc_push/drm-misc-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu.h
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
# drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
# drivers/gpu/drm/drm_gem.c
# include/drm/ttm/ttm_resource.h
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 23c9a60693ee..25731719c627 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -451,7 +451,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, if (domain & AMDGPU_GEM_DOMAIN_GTT) { man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT); - if (size < (man->size << PAGE_SHIFT)) + if (size < man->size) return true; else goto fail; @@ -460,7 +460,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, if (domain & AMDGPU_GEM_DOMAIN_VRAM) { man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM); - if (size < (man->size << PAGE_SHIFT)) + if (size < man->size) return true; else goto fail; |