|
@@ -2034,9 +2034,8 @@ static int gfx_v8_0_sw_init(void *handle)
|
|
ring->doorbell_index = AMDGPU_DOORBELL_GFX_RING0;
|
|
ring->doorbell_index = AMDGPU_DOORBELL_GFX_RING0;
|
|
}
|
|
}
|
|
|
|
|
|
- r = amdgpu_ring_init(adev, ring, 1024,
|
|
|
|
- PACKET3(PACKET3_NOP, 0x3FFF), 0xff,
|
|
|
|
- &adev->gfx.eop_irq, AMDGPU_CP_IRQ_GFX_EOP);
|
|
|
|
|
|
+ r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq,
|
|
|
|
+ AMDGPU_CP_IRQ_GFX_EOP);
|
|
if (r)
|
|
if (r)
|
|
return r;
|
|
return r;
|
|
}
|
|
}
|
|
@@ -2060,9 +2059,8 @@ static int gfx_v8_0_sw_init(void *handle)
|
|
sprintf(ring->name, "comp_%d.%d.%d", ring->me, ring->pipe, ring->queue);
|
|
sprintf(ring->name, "comp_%d.%d.%d", ring->me, ring->pipe, ring->queue);
|
|
irq_type = AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP + ring->pipe;
|
|
irq_type = AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP + ring->pipe;
|
|
/* type-2 packets are deprecated on MEC, use type-3 instead */
|
|
/* type-2 packets are deprecated on MEC, use type-3 instead */
|
|
- r = amdgpu_ring_init(adev, ring, 1024,
|
|
|
|
- PACKET3(PACKET3_NOP, 0x3FFF), 0xff,
|
|
|
|
- &adev->gfx.eop_irq, irq_type);
|
|
|
|
|
|
+ r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq,
|
|
|
|
+ irq_type);
|
|
if (r)
|
|
if (r)
|
|
return r;
|
|
return r;
|
|
}
|
|
}
|
|
@@ -6528,6 +6526,8 @@ const struct amd_ip_funcs gfx_v8_0_ip_funcs = {
|
|
|
|
|
|
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
|
|
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
|
|
.type = AMDGPU_RING_TYPE_GFX,
|
|
.type = AMDGPU_RING_TYPE_GFX,
|
|
|
|
+ .align_mask = 0xff,
|
|
|
|
+ .nop = PACKET3(PACKET3_NOP, 0x3FFF),
|
|
.get_rptr = gfx_v8_0_ring_get_rptr,
|
|
.get_rptr = gfx_v8_0_ring_get_rptr,
|
|
.get_wptr = gfx_v8_0_ring_get_wptr_gfx,
|
|
.get_wptr = gfx_v8_0_ring_get_wptr_gfx,
|
|
.set_wptr = gfx_v8_0_ring_set_wptr_gfx,
|
|
.set_wptr = gfx_v8_0_ring_set_wptr_gfx,
|
|
@@ -6558,6 +6558,8 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {
|
|
|
|
|
|
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
|
|
static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
|
|
.type = AMDGPU_RING_TYPE_COMPUTE,
|
|
.type = AMDGPU_RING_TYPE_COMPUTE,
|
|
|
|
+ .align_mask = 0xff,
|
|
|
|
+ .nop = PACKET3(PACKET3_NOP, 0x3FFF),
|
|
.get_rptr = gfx_v8_0_ring_get_rptr,
|
|
.get_rptr = gfx_v8_0_ring_get_rptr,
|
|
.get_wptr = gfx_v8_0_ring_get_wptr_compute,
|
|
.get_wptr = gfx_v8_0_ring_get_wptr_compute,
|
|
.set_wptr = gfx_v8_0_ring_set_wptr_compute,
|
|
.set_wptr = gfx_v8_0_ring_set_wptr_compute,
|