On Thu, May 31, 2018 at 12:48:19PM -0500, Alex Deucher wrote: > 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. > > Signed-off-by: Alex Deucher <alexander.deucher at amd.com> Reviewed-by: Huang Rui <ray.huang at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c > index 8ff4c60d1b59..702e257a483f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik.c > @@ -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) > -- > 2.13.6 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
