amd: add Dimgrey Cavefish support

Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6820>
This commit is contained in:
Marek Olšák 2019-09-16 21:41:08 -04:00 committed by Marge Bot
parent 40a50e9398
commit d7495bd123
6 changed files with 13 additions and 0 deletions

View File

@ -99,6 +99,7 @@
#define AMDGPU_NAVI14_RANGE 0x14, 0x28
#define AMDGPU_SIENNA_CICHLID_RANGE 0x28, 0x32
#define AMDGPU_NAVY_FLOUNDER_RANGE 0x32, 0x3C
#define AMDGPU_DIMGREY_CAVEFISH_RANGE 0x3C, 0x46
#define AMDGPU_EXPAND_FIX(x) x
#define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max))
@ -148,5 +149,6 @@
#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)
#define ASICREV_IS_DIMGREY_CAVEFISH(r) ASICREV_IS(r, DIMGREY_CAVEFISH)
#endif // _AMDGPU_ASIC_ADDR_H

View File

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

View File

@ -400,6 +400,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
identify_chip(NAVI14);
identify_chip(SIENNA_CICHLID);
identify_chip(NAVY_FLOUNDER);
identify_chip(DIMGREY_CAVEFISH);
break;
}
@ -706,6 +707,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
case CHIP_NAVI12:
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
case CHIP_DIMGREY_CAVEFISH:
pc_lines = 1024;
break;
case CHIP_NAVI14:

View File

@ -105,6 +105,7 @@ enum radeon_family
CHIP_NAVI14,
CHIP_SIENNA_CICHLID,
CHIP_NAVY_FLOUNDER,
CHIP_DIMGREY_CAVEFISH,
CHIP_LAST,
};

View File

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

View File

@ -1614,6 +1614,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
case CHIP_ARCTURUS:
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
case CHIP_DIMGREY_CAVEFISH:
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;