diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 20 | 
1 files changed, 17 insertions, 3 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c index 5dbe03d3b0dd..c477f8972d5d 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c @@ -52,6 +52,17 @@  #define BIF_MMSCH1_DOORBELL_RANGE__OFFSET_MASK          0x00000FFCL  #define BIF_MMSCH1_DOORBELL_RANGE__SIZE_MASK            0x001F0000L +#define BIF_MMSCH1_DOORBELL_RANGE__OFFSET_MASK          0x00000FFCL +#define BIF_MMSCH1_DOORBELL_RANGE__SIZE_MASK            0x001F0000L + +#define mmBIF_MMSCH1_DOORBELL_RANGE_ALDE                0x01d8 +#define mmBIF_MMSCH1_DOORBELL_RANGE_ALDE_BASE_IDX       2 +//BIF_MMSCH1_DOORBELL_ALDE_RANGE +#define BIF_MMSCH1_DOORBELL_RANGE_ALDE__OFFSET__SHIFT   0x2 +#define BIF_MMSCH1_DOORBELL_RANGE_ALDE__SIZE__SHIFT     0x10 +#define BIF_MMSCH1_DOORBELL_RANGE_ALDE__OFFSET_MASK     0x00000FFCL +#define BIF_MMSCH1_DOORBELL_RANGE_ALDE__SIZE_MASK       0x001F0000L +  #define mmRCC_DEV0_EPF0_STRAP0_ALDE			0x0015  #define mmRCC_DEV0_EPF0_STRAP0_ALDE_BASE_IDX		2 @@ -142,9 +153,12 @@ static void nbio_v7_4_vcn_doorbell_range(struct amdgpu_device *adev, bool use_do  	u32 reg;  	u32 doorbell_range; -	if (instance) -		reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH1_DOORBELL_RANGE); -	else +	if (instance) { +		if (adev->asic_type == CHIP_ALDEBARAN) +			reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH1_DOORBELL_RANGE_ALDE); +		else +			reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH1_DOORBELL_RANGE); +	} else  		reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH0_DOORBELL_RANGE);  	doorbell_range = RREG32(reg); | 
