amd: add support for Navy Flounder

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6100>
This commit is contained in:
Marek Olšák
2020-07-27 19:13:51 -04:00
committed by Marge Bot
parent 037b84df11
commit abed921ce7
6 changed files with 13 additions and 0 deletions

View File

@@ -98,6 +98,7 @@
#define AMDGPU_NAVI12_RANGE 0x0A, 0x14
#define AMDGPU_NAVI14_RANGE 0x14, 0x28
#define AMDGPU_SIENNA_CICHLID_RANGE 0x28, 0x32
#define AMDGPU_NAVY_FLOUNDER_RANGE 0x32, 0x3C
#define AMDGPU_EXPAND_FIX(x) x
#define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max))
@@ -146,5 +147,6 @@
#define ASICREV_IS_NAVI12(r) ASICREV_IS(r, NAVI12)
#define ASICREV_IS_NAVI14(r) ASICREV_IS(r, NAVI14)
#define ASICREV_IS_SIENNA_CICHLID(r) ASICREV_IS(r, SIENNA_CICHLID)
#define ASICREV_IS_NAVY_FLOUNDER(r) ASICREV_IS(r, NAVY_FLOUNDER)
#endif // _AMDGPU_ASIC_ADDR_H

View File

@@ -927,6 +927,12 @@ ChipFamily Gfx10Lib::HwlConvertChipFamily(
m_settings.supportRbPlus = 1;
m_settings.dccUnsup3DSwDis = 0;
}
if (ASICREV_IS_NAVY_FLOUNDER(chipRevision))
{
m_settings.supportRbPlus = 1;
m_settings.dccUnsup3DSwDis = 0;
}
break;
default:
ADDR_ASSERT(!"Unknown chip family");

View File

@@ -410,6 +410,7 @@ bool ac_query_gpu_info(int fd, void *dev_p,
identify_chip(NAVI12);
identify_chip(NAVI14);
identify_chip(SIENNA_CICHLID);
identify_chip(NAVY_FLOUNDER);
break;
}
@@ -742,6 +743,7 @@ bool ac_query_gpu_info(int fd, void *dev_p,
case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
pc_lines = 1024;
break;
case CHIP_NAVI14:

View File

@@ -103,6 +103,7 @@ enum radeon_family {
CHIP_NAVI12,
CHIP_NAVI14,
CHIP_SIENNA_CICHLID,
CHIP_NAVY_FLOUNDER,
CHIP_LAST,
};

View File

@@ -157,6 +157,7 @@ const char *ac_get_llvm_processor_name(enum radeon_family family)
case CHIP_NAVI14:
return "gfx1012";
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
return "gfx1030";
default:
return "";

View File

@@ -1590,6 +1590,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
break;
case CHIP_ARCTURUS:
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
dec->reg.data0 = RDECODE_VCN2_5_GPCOM_VCPU_DATA0;
dec->reg.data1 = RDECODE_VCN2_5_GPCOM_VCPU_DATA1;
dec->reg.cmd = RDECODE_VCN2_5_GPCOM_VCPU_CMD;