drm/amdgpu: Fix display corruption on CI with dpm enabled (51d45cbc) · Commits · 戴 / test

with dpm enabled, need to get active crtcs in dc/no-dc mode. caused by 'commit ebb649667a31 ("drm/amdgpu: Set pm_display_cfg in non-dc mode")' Reviewed-by:

Huang Rui <ray.huang@amd.com> Signed-off-by:

Rex Zhu <Rex.Zhu@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+16 −16

Original line number	Diff line number	Diff line
		@@ -1878,6 +1878,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
		amdgpu_fence_wait_empty(ring);
		}

		if (adev->powerplay.pp_funcs->dispatch_tasks) {
		if (!amdgpu_device_has_dc_support(adev)) {
		mutex_lock(&adev->pm.mutex);
		amdgpu_dpm_get_active_displays(adev);
		@@ -1893,11 +1894,10 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
		&adev->pm.pm_display_cfg);
		mutex_unlock(&adev->pm.mutex);
		}

		if (adev->powerplay.pp_funcs->dispatch_tasks) {
		amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE, NULL);
		} else {
		mutex_lock(&adev->pm.mutex);
		amdgpu_dpm_get_active_displays(adev);
		/* update battery/ac status */
		if (power_supply_is_system_supplied() > 0)
		adev->pm.dpm.ac_power = true;

Admin message