linux-next: manual merge of the drm tree with the amdgpu tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2180 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

between commit:

  03dce35deb8575 ("drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h")

from the amdgpu tree and commit:

  eee3258e8f8be8 ("drm/amd/powerplay: add the interface for getting ultimate frequency v3")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index a78b2e2958950,320ac20146fd1..0000000000000
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@@ -907,10 -746,14 +746,10 @@@ struct smu_func
  	((smu)->funcs->register_irq_handler ? (smu)->funcs->register_irq_handler(smu) : 0)
  #define smu_set_azalia_d3_pme(smu) \
  	((smu)->funcs->set_azalia_d3_pme ? (smu)->funcs->set_azalia_d3_pme((smu)) : 0)
+ #define smu_get_dpm_ultimate_freq(smu, param, min, max) \
+ 		((smu)->funcs->get_dpm_ultimate_freq ? (smu)->funcs->get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0)
 -#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
 -	((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0)
  #define smu_get_max_sustainable_clocks_by_dc(smu, max_clocks) \
  	((smu)->funcs->get_max_sustainable_clocks_by_dc ? (smu)->funcs->get_max_sustainable_clocks_by_dc((smu), (max_clocks)) : 0)
--#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
--	((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0)
  #define smu_baco_is_support(smu) \
  	((smu)->funcs->baco_is_support? (smu)->funcs->baco_is_support((smu)) : false)
  #define smu_baco_get_state(smu, state) \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]