[PATCH 6/8] drm/amdgpu: remove Arcturus references from vega10 ih

Felix Kuehling felix.kuehling at amd.com
Wed Mar 18 23:26:50 UTC 2020


I believe this should be squashed into Patch #8 or applied after patch 
#8. Otherwise it creates a broken intermediate state where Arcturus 
doesn't have any valid IH support. That said, it's probably less 
critical because it only affects the case of direct (backdoor) firmware 
loading.

Regards,
   Felix

On 2020-03-18 18:51, Alex Sierra wrote:
> Arcturus has its own ih implementation. There's no need to support
> this on vega10 ih anymore.
>
> Change-Id: I29c843e0b12a458d2915129503c0ad852bcebc48
> Signed-off-by: Alex Sierra <alex.sierra at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> index 407c6093c2ec..608e8da9b962 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> @@ -246,9 +246,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)
>   		WREG32_SOC15(OSSSYS, 0, mmIH_RB_CNTL, ih_rb_cntl);
>   	}
>   
> -	if ((adev->asic_type == CHIP_ARCTURUS &&
> -	     adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) ||
> -	    adev->asic_type == CHIP_RENOIR) {
> +	if (adev->asic_type == CHIP_RENOIR) {
>   		ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN);
>   		if (adev->irq.ih.use_bus_addr) {
>   			ih_chicken = REG_SET_FIELD(ih_chicken, IH_CHICKEN,


More information about the amd-gfx mailing list