drm/amdgpu/navi10_ih: convert to IP version checking
Use IP versions rather than asic_type to differentiate IP version specific features. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
258fa17d1a
commit
7c69d6153e
@ -107,7 +107,7 @@ force_update_wptr_for_self_int(struct amdgpu_device *adev,
|
||||
{
|
||||
u32 ih_cntl, ih_rb_cntl;
|
||||
|
||||
if (adev->asic_type < CHIP_SIENNA_CICHLID)
|
||||
if (adev->ip_versions[OSSSYS_HWIP] < IP_VERSION(5, 0, 3))
|
||||
return;
|
||||
|
||||
ih_cntl = RREG32_SOC15(OSSSYS, 0, mmIH_CNTL2);
|
||||
@ -332,13 +332,10 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)
|
||||
|
||||
if (unlikely(adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT)) {
|
||||
if (ih[0]->use_bus_addr) {
|
||||
switch (adev->asic_type) {
|
||||
case CHIP_SIENNA_CICHLID:
|
||||
case CHIP_NAVY_FLOUNDER:
|
||||
case CHIP_VANGOGH:
|
||||
case CHIP_DIMGREY_CAVEFISH:
|
||||
case CHIP_BEIGE_GOBY:
|
||||
case CHIP_YELLOW_CARP:
|
||||
switch (adev->ip_versions[OSSSYS_HWIP]) {
|
||||
case IP_VERSION(5, 0, 3):
|
||||
case IP_VERSION(5, 2, 0):
|
||||
case IP_VERSION(5, 2, 1):
|
||||
ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN_Sienna_Cichlid);
|
||||
ih_chicken = REG_SET_FIELD(ih_chicken,
|
||||
IH_CHICKEN, MC_SPACE_GPA_ENABLE, 1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user