Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3120e2a3 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/pp: switch the default dpm implementation for CI 



Switch hawaii and bonaire to use powerplay rather than the old
dpm implementation.  Powerplay supports more features and is
better maintained.  Ultimately, we can drop the older dpm
implementation like we did for other older asics.

Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarRex Zhu <rezhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d1a9146b

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

+4 −4
Original line number Diff line number Diff line
@@ -2003,9 +2003,9 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);

		amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);

		if (amdgpu_dpm == -1)

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		if (adev->enable_virtual_display)

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)
@@ -2024,9 +2024,9 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);

		amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);

		if (amdgpu_dpm == -1)

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		if (adev->enable_virtual_display)

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)