Commit 68c60b34 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.5-2023-08-16' of... 

Merge tag 'amd-drm-fixes-6.5-2023-08-16' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.5-2023-08-16:

amdgpu:
- SMU 13.x fixes
- Fix mcbp parameter for gfx9
- SMU 11.x fixes
- Temporary fix for large numbers of XCP partitions
- S0ix fixes
- DCN 2.0 fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230816200226.10771-1-alexander.deucher@amd.com
parents be48306f 6ecc1029

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

+6 −4
Original line number Diff line number Diff line
@@ -3722,8 +3722,9 @@ static void amdgpu_device_set_mcbp(struct amdgpu_device *adev) 
{

	if (amdgpu_mcbp == 1)

		adev->gfx.mcbp = true;



	if ((adev->ip_versions[GC_HWIP][0] >= IP_VERSION(9, 0, 0)) &&

	else if (amdgpu_mcbp == 0)

		adev->gfx.mcbp = false;

	else if ((adev->ip_versions[GC_HWIP][0] >= IP_VERSION(9, 0, 0)) &&

		 (adev->ip_versions[GC_HWIP][0] < IP_VERSION(10, 0, 0)) &&

		 adev->gfx.num_gfx_rings)

		adev->gfx.mcbp = true;
@@ -4393,6 +4394,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);



	cancel_delayed_work_sync(&adev->delayed_init_work);

	flush_delayed_work(&adev->gfx.gfx_off_delay_work);



	amdgpu_ras_suspend(adev);

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

+39 −2
Original line number Diff line number Diff line
@@ -551,6 +551,41 @@ int amdgpu_fence_driver_sw_init(struct amdgpu_device *adev) 
	return 0;

}



/**

 * amdgpu_fence_need_ring_interrupt_restore - helper function to check whether

 * fence driver interrupts need to be restored.

 *

 * @ring: ring that to be checked

 *

 * Interrupts for rings that belong to GFX IP don't need to be restored

 * when the target power state is s0ix.

 *

 * Return true if need to restore interrupts, false otherwise.

 */

static bool amdgpu_fence_need_ring_interrupt_restore(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	bool is_gfx_power_domain = false;



	switch (ring->funcs->type) {

	case AMDGPU_RING_TYPE_SDMA:

	/* SDMA 5.x+ is part of GFX power domain so it's covered by GFXOFF */

		if (adev->ip_versions[SDMA0_HWIP][0] >= IP_VERSION(5, 0, 0))

			is_gfx_power_domain = true;

		break;

	case AMDGPU_RING_TYPE_GFX:

	case AMDGPU_RING_TYPE_COMPUTE:

	case AMDGPU_RING_TYPE_KIQ:

	case AMDGPU_RING_TYPE_MES:

		is_gfx_power_domain = true;

		break;

	default:

		break;

	}



	return !(adev->in_s0ix && is_gfx_power_domain);

}



/**

 * amdgpu_fence_driver_hw_fini - tear down the fence driver

 * for all possible rings.
@@ -579,7 +614,8 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev) 
			amdgpu_fence_driver_force_completion(ring);



		if (!drm_dev_is_unplugged(adev_to_drm(adev)) &&

		    ring->fence_drv.irq_src)

		    ring->fence_drv.irq_src &&

		    amdgpu_fence_need_ring_interrupt_restore(ring))

			amdgpu_irq_put(adev, ring->fence_drv.irq_src,

				       ring->fence_drv.irq_type);
@@ -655,7 +691,8 @@ void amdgpu_fence_driver_hw_init(struct amdgpu_device *adev) 
			continue;



		/* enable the interrupt */

		if (ring->fence_drv.irq_src)

		if (ring->fence_drv.irq_src &&

		    amdgpu_fence_need_ring_interrupt_restore(ring))

			amdgpu_irq_get(adev, ring->fence_drv.irq_src,

				       ring->fence_drv.irq_type);

	}

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

+1 −8
Original line number Diff line number Diff line
@@ -692,16 +692,9 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) 


		if (adev->gfx.gfx_off_req_count == 0 &&

		    !adev->gfx.gfx_off_state) {

			/* If going to s2idle, no need to wait */

			if (adev->in_s0ix) {

				if (!amdgpu_dpm_set_powergating_by_smu(adev,

						AMD_IP_BLOCK_TYPE_GFX, true))

					adev->gfx.gfx_off_state = true;

			} else {

			schedule_delayed_work(&adev->gfx.gfx_off_delay_work,

					      delay);

		}

		}

	} else {

		if (adev->gfx.gfx_off_req_count == 0) {

			cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);

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

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ void amdgpu_sw_ring_ib_begin(struct amdgpu_ring *ring) 
	struct amdgpu_ring_mux *mux = &adev->gfx.muxer;



	WARN_ON(!ring->is_sw_ring);

	if (ring->hw_prio > AMDGPU_RING_PRIO_DEFAULT) {

	if (adev->gfx.mcbp && ring->hw_prio > AMDGPU_RING_PRIO_DEFAULT) {

		if (amdgpu_mcbp_scan(mux) > 0)

			amdgpu_mcbp_trigger_preempt(mux);

		return;

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

+12 −1
Original line number Diff line number Diff line
@@ -239,8 +239,13 @@ static int amdgpu_xcp_dev_alloc(struct amdgpu_device *adev) 


	for (i = 1; i < MAX_XCP; i++) {

		ret = amdgpu_xcp_drm_dev_alloc(&p_ddev);

		if (ret)

		if (ret == -ENOSPC) {

			dev_warn(adev->dev,

			"Skip xcp node #%d when out of drm node resource.", i);

			return 0;

		} else if (ret) {

			return ret;

		}



		/* Redirect all IOCTLs to the primary device */

		adev->xcp_mgr->xcp[i].rdev = p_ddev->render->dev;
@@ -328,6 +333,9 @@ int amdgpu_xcp_dev_register(struct amdgpu_device *adev, 
		return 0;



	for (i = 1; i < MAX_XCP; i++) {

		if (!adev->xcp_mgr->xcp[i].ddev)

			break;



		ret = drm_dev_register(adev->xcp_mgr->xcp[i].ddev, ent->driver_data);

		if (ret)

			return ret;
@@ -345,6 +353,9 @@ void amdgpu_xcp_dev_unplug(struct amdgpu_device *adev) 
		return;



	for (i = 1; i < MAX_XCP; i++) {

		if (!adev->xcp_mgr->xcp[i].ddev)

			break;



		p_ddev = adev->xcp_mgr->xcp[i].ddev;

		drm_dev_unplug(p_ddev);

		p_ddev->render->dev = adev->xcp_mgr->xcp[i].rdev;