Commit 45a3e06b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() 



Rather than checking the asic_type.

Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fe5e8f07

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+3 −3
Original line number Diff line number Diff line
@@ -691,9 +691,9 @@ static int convert_tiling_flags_to_modifier(struct amdgpu_framebuffer *afb) 
			return -EINVAL;

		}



		if (adev->asic_type >= CHIP_SIENNA_CICHLID)

		if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(10, 3, 0))

			version = AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS;

		else if (adev->family == AMDGPU_FAMILY_NV)

		else if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(10, 0, 0))

			version = AMD_FMT_MOD_TILE_VER_GFX10;

		else

			version = AMD_FMT_MOD_TILE_VER_GFX9;
@@ -787,7 +787,7 @@ static int convert_tiling_flags_to_modifier(struct amdgpu_framebuffer *afb) 
				if (adev->family >= AMDGPU_FAMILY_NV) {

					int extra_pipe = 0;



					if (adev->asic_type >= CHIP_SIENNA_CICHLID &&

					if ((adev->ip_versions[GC_HWIP][0] >= IP_VERSION(10, 3, 0)) &&

					    pipes == packers && pipes > 1)

						extra_pipe = 1;