GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdgpu: make BO type check less restrictive

Browse source 
BO with ttm_bo_type_sg type can also have tiling_flag and metadata.
So so BO type check for only ttm_bo_type_kernel.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reported-by: Tom StDenis <Tom.StDenis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nirmoy Das 2021-03-15 16:02:37 +01:00 • committed by Alex Deucher
parent cc1bcf85b0
commit 030bb4addb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
View file

@ -1164,7 +1164,7 @@ int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
struct amdgpu_bo_user *ubo; struct amdgpu_bo_user *ubo;
BUG_ON(bo->tbo.type != ttm_bo_type_device); BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
if (adev->family <= AMDGPU_FAMILY_CZ && if (adev->family <= AMDGPU_FAMILY_CZ &&
AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6) AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
return -EINVAL; return -EINVAL;
@ -1186,7 +1186,7 @@ void amdgpu_bo_get_tiling_flags(struct amdgpu_bo *bo, u64 *tiling_flags)
{ {
struct amdgpu_bo_user *ubo; struct amdgpu_bo_user *ubo;
BUG_ON(bo->tbo.type != ttm_bo_type_device); BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
dma_resv_assert_held(bo->tbo.base.resv); dma_resv_assert_held(bo->tbo.base.resv);
ubo = to_amdgpu_bo_user(bo); ubo = to_amdgpu_bo_user(bo);
@ -1213,7 +1213,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,
struct amdgpu_bo_user *ubo; struct amdgpu_bo_user *ubo;
void *buffer; void *buffer;
BUG_ON(bo->tbo.type != ttm_bo_type_device); BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
ubo = to_amdgpu_bo_user(bo); ubo = to_amdgpu_bo_user(bo);
if (!metadata_size) { if (!metadata_size) {
if (ubo->metadata_size) { if (ubo->metadata_size) {
@ -1263,7 +1263,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
if (!buffer && !metadata_size) if (!buffer && !metadata_size)
return -EINVAL; return -EINVAL;
BUG_ON(bo->tbo.type != ttm_bo_type_device); BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
ubo = to_amdgpu_bo_user(bo); ubo = to_amdgpu_bo_user(bo);
if (buffer) { if (buffer) {
if (buffer_size < ubo->metadata_size) if (buffer_size < ubo->metadata_size)