Commit 8594a2d8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.12-2024-10-31' of... 

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

 into drm-fixes

amd-drm-fixes-6.12-2024-10-31:

amdgpu:
- DCN 3.5 fix
- Vangogh SMU KASAN fix
- SMU 13 profile reporting fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241031151539.3523633-1-alexander.deucher@amd.com
parents 989c5b90 935abb86

drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ void build_unoptimized_policy_settings(enum dml_project_id project, struct dml_m 
	if (project == dml_project_dcn35 ||

		project == dml_project_dcn351) {

		policy->DCCProgrammingAssumesScanDirectionUnknownFinal = false;

		policy->EnhancedPrefetchScheduleAccelerationFinal = 0;

		policy->AllowForPStateChangeOrStutterInVBlankFinal = dml_prefetch_support_uclk_fclk_and_stutter_if_possible; /*new*/

		policy->UseOnlyMaxPrefetchModes = 1;

	}

drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c

+3 −1
Original line number Diff line number Diff line
@@ -242,7 +242,9 @@ static int vangogh_tables_init(struct smu_context *smu) 
		goto err0_out;

	smu_table->metrics_time = 0;



	smu_table->gpu_metrics_table_size = max(sizeof(struct gpu_metrics_v2_3), sizeof(struct gpu_metrics_v2_2));

	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2);

	smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_3));

	smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_4));

	smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);

	if (!smu_table->gpu_metrics_table)

		goto err1_out;

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

+3 −3
Original line number Diff line number Diff line
@@ -2485,7 +2485,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu, 
	DpmActivityMonitorCoeffInt_t *activity_monitor =

		&(activity_monitor_external.DpmActivityMonitorCoeffInt);

	int workload_type, ret = 0;

	u32 workload_mask;

	u32 workload_mask, selected_workload_mask;



	smu->power_profile_mode = input[size];
@@ -2552,7 +2552,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu, 
	if (workload_type < 0)

		return -EINVAL;



	workload_mask = 1 << workload_type;

	selected_workload_mask = workload_mask = 1 << workload_type;



	/* Add optimizations for SMU13.0.0/10.  Reuse the power saving profile */

	if ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
@@ -2572,7 +2572,7 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu, 
					       workload_mask,

					       NULL);

	if (!ret)

		smu->workload_mask = workload_mask;

		smu->workload_mask = selected_workload_mask;



	return ret;

}