diff options
author | Marek Olšák <marek.olsak@amd.com> | 2017-03-03 16:03:15 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:54:40 -0400 |
commit | 9079ac7666c23fecc0b59d136efd349fc1038ba6 (patch) | |
tree | 4f33aa1c96528c402ce5aa3243f66bf8b6cb5680 | |
parent | 00ac6f6be1c875495320c257a70c82768fffedb3 (diff) |
drm/amdgpu: don't validate TILE_SPLIT on GFX9
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 759da5910b76..9b2e1f18acfa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |||
@@ -815,7 +815,10 @@ int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo, | |||
815 | 815 | ||
816 | int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags) | 816 | int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags) |
817 | { | 817 | { |
818 | if (AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6) | 818 | struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); |
819 | |||
820 | if (adev->family <= AMDGPU_FAMILY_CZ && | ||
821 | AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6) | ||
819 | return -EINVAL; | 822 | return -EINVAL; |
820 | 823 | ||
821 | bo->tiling_flags = tiling_flags; | 824 | bo->tiling_flags = tiling_flags; |