Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f3b2d5 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: pad gfx and compute rings to 256 dw 



The same as on windows to avoid further problems with CE/DE
command submission overlaps.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ec9aaaff

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2896,7 +2896,7 @@ static int gfx_v6_0_sw_init(void *handle) 
		ring->ring_obj = NULL;

		sprintf(ring->name, "gfx");

		r = amdgpu_ring_init(adev, ring, 1024,

				     0x80000000, 0xf,

				     0x80000000, 0xff,

				     &adev->gfx.eop_irq, AMDGPU_CP_IRQ_GFX_EOP,

				     AMDGPU_RING_TYPE_GFX);

		if (r)
@@ -2920,7 +2920,7 @@ static int gfx_v6_0_sw_init(void *handle) 
		sprintf(ring->name, "comp %d.%d.%d", ring->me, ring->pipe, ring->queue);

		irq_type = AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP + ring->pipe;

		r = amdgpu_ring_init(adev, ring, 1024,

				     0x80000000, 0xf,

				     0x80000000, 0xff,

				     &adev->gfx.eop_irq, irq_type,

				     AMDGPU_RING_TYPE_COMPUTE);

		if (r)

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c

+2 −2
Original line number Diff line number Diff line
@@ -4646,7 +4646,7 @@ static int gfx_v7_0_sw_init(void *handle) 
		ring->ring_obj = NULL;

		sprintf(ring->name, "gfx");

		r = amdgpu_ring_init(adev, ring, 1024,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xf,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xff,

				     &adev->gfx.eop_irq, AMDGPU_CP_IRQ_GFX_EOP,

				     AMDGPU_RING_TYPE_GFX);

		if (r)
@@ -4673,7 +4673,7 @@ static int gfx_v7_0_sw_init(void *handle) 
		irq_type = AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP + ring->pipe;

		/* type-2 packets are deprecated on MEC, use type-3 instead */

		r = amdgpu_ring_init(adev, ring, 1024,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xf,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xff,

				     &adev->gfx.eop_irq, irq_type,

				     AMDGPU_RING_TYPE_COMPUTE);

		if (r)

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2035,7 +2035,7 @@ static int gfx_v8_0_sw_init(void *handle) 
		}



		r = amdgpu_ring_init(adev, ring, 1024,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xf,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xff,

				     &adev->gfx.eop_irq, AMDGPU_CP_IRQ_GFX_EOP,

				     AMDGPU_RING_TYPE_GFX);

		if (r)
@@ -2062,7 +2062,7 @@ static int gfx_v8_0_sw_init(void *handle) 
		irq_type = AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP + ring->pipe;

		/* type-2 packets are deprecated on MEC, use type-3 instead */

		r = amdgpu_ring_init(adev, ring, 1024,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xf,

				     PACKET3(PACKET3_NOP, 0x3FFF), 0xff,

				     &adev->gfx.eop_irq, irq_type,

				     AMDGPU_RING_TYPE_COMPUTE);

		if (r)