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

Commit d2383267 authored by ozeng's avatar ozeng Committed by Alex Deucher
Browse files

drm/amdgpu: Initialize pipe priority order on graphic initialization 



Initialized PIPE_ORDER_TS0/1/2/3 field of SPI_ARB_PRIORITY register to 2.
This set the pipe priority order to:
02 - HP3D, CS_H, GFX, CS_M, CS_L

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

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

+8 −0
Original line number Diff line number Diff line
@@ -1983,6 +1983,14 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device *adev) 
	WREG32(mmPA_CL_ENHANCE, PA_CL_ENHANCE__CLIP_VTX_REORDER_ENA_MASK |

			(3 << PA_CL_ENHANCE__NUM_CLIP_SEQ__SHIFT));

	WREG32(mmPA_SC_ENHANCE, PA_SC_ENHANCE__ENABLE_PA_SC_OUT_OF_ORDER_MASK);



	tmp = RREG32(mmSPI_ARB_PRIORITY);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS0, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS1, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS2, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS3, 2);

	WREG32(mmSPI_ARB_PRIORITY, tmp);



	mutex_unlock(&adev->grbm_idx_mutex);



	udelay(50);

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

+8 −0
Original line number Diff line number Diff line
@@ -3898,6 +3898,14 @@ static void gfx_v8_0_gpu_init(struct amdgpu_device *adev) 
			PA_SC_FIFO_SIZE__SC_HIZ_TILE_FIFO_SIZE__SHIFT) |

		   (adev->gfx.config.sc_earlyz_tile_fifo_size <<

			PA_SC_FIFO_SIZE__SC_EARLYZ_TILE_FIFO_SIZE__SHIFT));



	tmp = RREG32(mmSPI_ARB_PRIORITY);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS0, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS1, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS2, 2);

	tmp = REG_SET_FIELD(tmp, SPI_ARB_PRIORITY, PIPE_ORDER_TS3, 2);

	WREG32(mmSPI_ARB_PRIORITY, tmp);



	mutex_unlock(&adev->grbm_idx_mutex);



}