Commit b4589db5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.9-2024-04-10' of... 

Merge tag 'amd-drm-fixes-6.9-2024-04-10' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.9-2024-04-10:

amdgpu:
- GPU reset fixes
- Fix some confusing logging
- UMSCH fix
- Aborted suspend fix
- DCN 3.5 fixes
- S4 fix
- MES logging fixes
- SMU 14 fixes
- SDMA 4.4.2 fix
- KASAN fix
- SMU 13.0.10 fix
- VCN partition fix
- GFX11 fixes
- DWB fixes
- Plane handling fix
- FAMS fix
- DCN 3.1.6 fix
- VSC SDP fixes
- OLED panel fix
- GFX 11.5 fix

amdkfd:
- GPU reset fixes

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ extern int amdgpu_async_gfx_ring; 
extern int amdgpu_mcbp;

extern int amdgpu_discovery;

extern int amdgpu_mes;

extern int amdgpu_mes_log_enable;

extern int amdgpu_mes_kiq;

extern int amdgpu_noretry;

extern int amdgpu_force_asic_type;

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

+15 −11
Original line number Diff line number Diff line
@@ -4135,6 +4135,9 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
					adev->ip_blocks[i].status.hw = true;

				}

			}

		} else if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&

				   !amdgpu_device_has_display_hardware(adev)) {

					r = psp_gpu_reset(adev);

		} else {

				tmp = amdgpu_reset_method;

				/* It should do a default reset when loading or reloading the driver,
@@ -4143,12 +4146,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
				amdgpu_reset_method = AMD_RESET_METHOD_NONE;

				r = amdgpu_asic_reset(adev);

				amdgpu_reset_method = tmp;

		}



		if (r) {

		  dev_err(adev->dev, "asic reset on init failed\n");

		  goto failed;

		}

	}

	}



	/* Post card if necessary */

	if (amdgpu_device_need_post(adev)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -1896,6 +1896,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);

		break;

	case IP_VERSION(14, 0, 0):

	case IP_VERSION(14, 0, 1):

		amdgpu_device_ip_block_add(adev, &smu_v14_0_ip_block);

		break;

	default:

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

+10 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ int amdgpu_async_gfx_ring = 1; 
int amdgpu_mcbp = -1;

int amdgpu_discovery = -1;

int amdgpu_mes;

int amdgpu_mes_log_enable = 0;

int amdgpu_mes_kiq;

int amdgpu_noretry = -1;

int amdgpu_force_asic_type = -1;
@@ -667,6 +668,15 @@ MODULE_PARM_DESC(mes, 
	"Enable Micro Engine Scheduler (0 = disabled (default), 1 = enabled)");

module_param_named(mes, amdgpu_mes, int, 0444);



/**

 * DOC: mes_log_enable (int)

 * Enable Micro Engine Scheduler log. This is used to enable/disable MES internal log.

 * (0 = disabled (default), 1 = enabled)

 */

MODULE_PARM_DESC(mes_log_enable,

	"Enable Micro Engine Scheduler log (0 = disabled (default), 1 = enabled)");

module_param_named(mes_log_enable, amdgpu_mes_log_enable, int, 0444);



/**

 * DOC: mes_kiq (int)

 * Enable Micro Engine Scheduler KIQ. This is a new engine pipe for kiq.

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

+5 −2
Original line number Diff line number Diff line
@@ -304,12 +304,15 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) 
		dma_fence_set_error(finished, -ECANCELED);



	if (finished->error < 0) {

		DRM_INFO("Skip scheduling IBs!\n");

		dev_dbg(adev->dev, "Skip scheduling IBs in ring(%s)",

			ring->name);

	} else {

		r = amdgpu_ib_schedule(ring, job->num_ibs, job->ibs, job,

				       &fence);

		if (r)

			DRM_ERROR("Error scheduling IBs (%d)\n", r);

			dev_err(adev->dev,

				"Error scheduling IBs (%d) in ring(%s)", r,

				ring->name);

	}



	job->job_run_counter++;