drm/amdgpu: don't validate TILE_SPLIT on GFX9
authorMarek Olšák <marek.olsak@amd.com>
Fri, 3 Mar 2017 21:03:15 +0000 (16:03 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 30 Mar 2017 03:54:40 +0000 (23:54 -0400)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

index 759da5910b761d6bfdf6958a14c9bc11a0a24c0d..9b2e1f18acfac6f70c26870dddf94d29db132a3f 100644 (file)
@@ -815,7 +815,10 @@ int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,
 
 int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
 {
-       if (AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
+       struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
+
+       if (adev->family <= AMDGPU_FAMILY_CZ &&
+           AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
                return -EINVAL;
 
        bo->tiling_flags = tiling_flags;