diff options
| author | Christian König <christian.koenig@amd.com> | 2019-03-04 19:59:36 +0100 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-03-19 15:36:58 -0500 | 
| commit | b51cd19e48b72dd31831d8f00fbcf34444e69f68 (patch) | |
| tree | 51fedd770284598cf18bb3e640c6748cb2bddaf5 /drivers/gpu/drm | |
| parent | 1ae64cec8ab7201487c1abcaee582b5333a6263b (diff) | |
drm/amdgpu: enable IH ring 1&2 for Vega20 as well
That doesn't seem to have any negative effects.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 30 | 
1 files changed, 13 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c index fa45234f020f..1b2f69a9a24e 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c @@ -469,23 +469,19 @@ static int vega10_ih_sw_init(void *handle)  	adev->irq.ih.use_doorbell = true;  	adev->irq.ih.doorbell_index = adev->doorbell_index.ih << 1; -	if (adev->asic_type == CHIP_VEGA10) { -		r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true); -		if (r) -			return r; - -		adev->irq.ih1.use_doorbell = true; -		adev->irq.ih1.doorbell_index = -			(adev->doorbell_index.ih + 1) << 1; - -		r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true); -		if (r) -			return r; - -		adev->irq.ih2.use_doorbell = true; -		adev->irq.ih2.doorbell_index = -			(adev->doorbell_index.ih + 2) << 1; -	} +	r = amdgpu_ih_ring_init(adev, &adev->irq.ih1, PAGE_SIZE, true); +	if (r) +		return r; + +	adev->irq.ih1.use_doorbell = true; +	adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih + 1) << 1; + +	r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true); +	if (r) +		return r; + +	adev->irq.ih2.use_doorbell = true; +	adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih + 2) << 1;  	r = amdgpu_irq_init(adev);  | 
