Commit 141bb6bc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.11-2024-09-05' of... 

Merge tag 'amd-drm-fixes-6.11-2024-09-05' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.11-2024-09-05:

amdgpu:
- IPS workaround
- Fix compatibility with older MES firmware
- Fix CPU spikes when clearing VRAM
- Backlight fix
- PMO fix
- Revert SWSMU change to fix regression

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240905190533.854116-1-alexander.deucher@amd.com
parents ca10367a 1a8d8454

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

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	/* always clear VRAM */

	flags |= AMDGPU_GEM_CREATE_VRAM_CLEARED;



	/* create a gem object to contain this object in */

	if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |

	    AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id) 
	uint64_t queue_mask = 0;

	int r, i, j;



	if (adev->enable_mes)

	if (adev->mes.enable_legacy_queue_map)

		return amdgpu_gfx_mes_enable_kcq(adev, xcc_id);



	if (!kiq->pmf || !kiq->pmf->kiq_map_queues || !kiq->pmf->kiq_set_resources)
@@ -719,7 +719,7 @@ int amdgpu_gfx_enable_kgq(struct amdgpu_device *adev, int xcc_id) 


	amdgpu_device_flush_hdp(adev, NULL);



	if (adev->enable_mes) {

	if (adev->mes.enable_legacy_queue_map) {

		for (i = 0; i < adev->gfx.num_gfx_rings; i++) {

			j = i + xcc_id * adev->gfx.num_gfx_rings;

			r = amdgpu_mes_map_legacy_queue(adev,

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct amdgpu_mes { 


	uint32_t			sched_version;

	uint32_t			kiq_version;

	bool                            enable_legacy_queue_map;



	uint32_t                        total_max_queue;

	uint32_t                        max_doorbell_slices;

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

+34 −15
Original line number Diff line number Diff line
@@ -693,6 +693,28 @@ static void mes_v11_0_free_ucode_buffers(struct amdgpu_device *adev, 
			      (void **)&adev->mes.ucode_fw_ptr[pipe]);

}



static void mes_v11_0_get_fw_version(struct amdgpu_device *adev)

{

	int pipe;



	/* get MES scheduler/KIQ versions */

	mutex_lock(&adev->srbm_mutex);



	for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) {

		soc21_grbm_select(adev, 3, pipe, 0, 0);



		if (pipe == AMDGPU_MES_SCHED_PIPE)

			adev->mes.sched_version =

				RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);

		else if (pipe == AMDGPU_MES_KIQ_PIPE && adev->enable_mes_kiq)

			adev->mes.kiq_version =

				RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);

	}



	soc21_grbm_select(adev, 0, 0, 0, 0);

	mutex_unlock(&adev->srbm_mutex);

}



static void mes_v11_0_enable(struct amdgpu_device *adev, bool enable)

{

	uint64_t ucode_addr;
@@ -1062,18 +1084,6 @@ static int mes_v11_0_queue_init(struct amdgpu_device *adev, 
		mes_v11_0_queue_init_register(ring);

	}



	/* get MES scheduler/KIQ versions */

	mutex_lock(&adev->srbm_mutex);

	soc21_grbm_select(adev, 3, pipe, 0, 0);



	if (pipe == AMDGPU_MES_SCHED_PIPE)

		adev->mes.sched_version = RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);

	else if (pipe == AMDGPU_MES_KIQ_PIPE && adev->enable_mes_kiq)

		adev->mes.kiq_version = RREG32_SOC15(GC, 0, regCP_MES_GP3_LO);



	soc21_grbm_select(adev, 0, 0, 0, 0);

	mutex_unlock(&adev->srbm_mutex);



	return 0;

}
@@ -1320,15 +1330,24 @@ static int mes_v11_0_kiq_hw_init(struct amdgpu_device *adev) 


	mes_v11_0_enable(adev, true);



	mes_v11_0_get_fw_version(adev);



	mes_v11_0_kiq_setting(&adev->gfx.kiq[0].ring);



	r = mes_v11_0_queue_init(adev, AMDGPU_MES_KIQ_PIPE);

	if (r)

		goto failure;



	if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x47)

		adev->mes.enable_legacy_queue_map = true;

	else

		adev->mes.enable_legacy_queue_map = false;



	if (adev->mes.enable_legacy_queue_map) {

		r = mes_v11_0_hw_init(adev);

		if (r)

			goto failure;

	}



	return r;

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

+6 −3
Original line number Diff line number Diff line
@@ -1266,6 +1266,7 @@ static int mes_v12_0_sw_init(void *handle) 
	adev->mes.funcs = &mes_v12_0_funcs;

	adev->mes.kiq_hw_init = &mes_v12_0_kiq_hw_init;

	adev->mes.kiq_hw_fini = &mes_v12_0_kiq_hw_fini;

	adev->mes.enable_legacy_queue_map = true;



	adev->mes.event_log_size = AMDGPU_MES_LOG_BUFFER_SIZE;
@@ -1422,9 +1423,11 @@ static int mes_v12_0_kiq_hw_init(struct amdgpu_device *adev) 
		mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_KIQ_PIPE);

	}



	if (adev->mes.enable_legacy_queue_map) {

		r = mes_v12_0_hw_init(adev);

		if (r)

			goto failure;

	}



	return r;