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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c

between commits:

  6351003b1f4ec ("drm/amd/display: wire DCN42B mcache programming callback")
  57cf172be2827 ("drm/amd/display: fix dcn42b det allocation order")
  c4bc7ffb91586 ("drm/amd/display: Fix DCN42B null registers & register masks")

from the drm-fixes tree and commits:

  85453fb4ff726 ("drm/amd/display: wire DCN42B mcache programming callback")
  183bbded999a7 ("drm/amd/display: fix dcn42b det allocation order")
  fd651b9a3be9e ("drm/amd/display: Add DCN42B VID_CRC_CONTROL and HBLANK_CONTROL registers")
  219fb1f4c5b91 ("drm/amd/display: Enable zstate support and fix seamless boot")
  b7d69145907cd ("drm/amd/display: Fix DCN42B null registers & register masks")
  6cefc59d36667 ("drm/amd/display: Enable IPS support for DCN4 Variant")
  329baa1c5f62b ("drm/amd/display: Enable PSR and Replay on DCN4 variant [Part 2]")
  e14fcf9e5d2b5 ("drm/amd/display: correct encoder minimal creation")
  d2184b1ba1be2 ("drm/amd/display: Enable pstate for DCN4 non-emulation builds")

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 --combined drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
index 94e166c0a9b0b,2334bc5b75b8f..0000000000000
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
@@@ -134,6 -134,19 +134,6 @@@
  #define regHUBP3_HUBPREQ_DEBUG                0x088d
  #define regHUBP3_HUBPREQ_DEBUG_BASE_IDX       2
  
 -#define regDP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL                                                   0x3687
 -#define regDP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX                                          2
 -#define regDP_SYM32_ENC1_DP_SYM32_ENC_VID_CRC_CONTROL                                                   0x375b
 -#define regDP_SYM32_ENC1_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX                                          2
 -#define regDP_SYM32_ENC2_DP_SYM32_ENC_VID_CRC_CONTROL                                                   0x382f
 -#define regDP_SYM32_ENC2_DP_SYM32_ENC_VID_CRC_CONTROL_BASE_IDX                                          2
 -#define regDP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL                                                    0x366b
 -#define regDP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX                                           2
 -#define regDP_SYM32_ENC1_DP_SYM32_ENC_HBLANK_CONTROL                                                    0x373f
 -#define regDP_SYM32_ENC1_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX                                           2
 -#define regDP_SYM32_ENC2_DP_SYM32_ENC_HBLANK_CONTROL                                                    0x3813
 -#define regDP_SYM32_ENC2_DP_SYM32_ENC_HBLANK_CONTROL_BASE_IDX                                           2
 -
  enum dcn401_clk_src_array_id {
  	DCN401_CLK_SRC_PLL0,
  	DCN401_CLK_SRC_PLL1,
@@@ -253,10 -266,10 +253,10 @@@ static struct bios_registers bios_regs
  static struct dce110_clk_src_regs clk_src_regs[5];
  
  static const struct dce110_clk_src_shift cs_shift = {
- 	CS_COMMON_MASK_SH_LIST_DCN3_2(__SHIFT)
+ 	CS_COMMON_MASK_SH_LIST_DCN4_0_1(__SHIFT)
  };
  static const struct dce110_clk_src_mask cs_mask = {
- 	CS_COMMON_MASK_SH_LIST_DCN3_2(_MASK)
+ 	CS_COMMON_MASK_SH_LIST_DCN4_0_1(_MASK)
  };
  #define abm_regs_init(id) \
  	ABM_DCN42B_REG_LIST_RI(id)
@@@ -351,7 -364,7 +351,7 @@@ static const struct dcn10_link_enc_mas
  	LINK_ENCODER_MASK_SH_LIST_DCN42B(_MASK)};
  
  #define hpo_dp_stream_encoder_reg_init(id) \
- 	DCN42B_HPO_DP_STREAM_ENC_REG_LIST_RI(id)
+ 	DCN42_HPO_DP_STREAM_ENC_REG_LIST_RI(id)
  
  static struct dcn31_hpo_dp_stream_encoder_registers hpo_dp_stream_enc_regs[4];
  
@@@ -775,7 -788,7 +775,7 @@@ static const struct dc_debug_options de
  	.underflow_assert_delay_us = 0xFFFFFFFF,
  	.dwb_fi_phase = -1, // -1 = disable,
  	.dmub_command_table = true,
- 	.pstate_enabled = false,
+ 	.pstate_enabled = true,
  	.enable_mem_low_power = {
  		.bits = {
  			.vga = false,
@@@ -801,7 -814,7 +801,7 @@@
  		}
  	},
  	.seamless_boot_odm_combine = DML_FAIL_SOURCE_PIXEL_FORMAT,
- 	.enable_z9_disable_interface = false, /* Allow support for the PMFW interface for disable Z9*/
+ 	.enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/
  	.minimum_z8_residency_time = 1, /* Always allow when other conditions are met */
  	.support_eDP1_5 = true,
  	.use_max_lb = true,
@@@ -823,7 -836,7 +823,7 @@@
  	.disable_timeout = true,
  	.min_disp_clk_khz = 50000,
  	.static_screen_wait_frames = 2,
- 	.disable_z10 = true,
+ 	.disable_z10 = false,
  	.ignore_pg = true,
  	.disable_stutter_for_wm_program = true,
  	.min_deep_sleep_dcfclk_khz = 8000,
@@@ -1034,9 -1047,9 +1034,9 @@@ static struct hubp *dcn42b_hubp_create
  }
  static const struct dc_panel_config dcn42b_panel_config_defaults = {
  	.psr = {
- 		.disable_psr = true,
+ 		.disable_psr = false,
  		.disallow_psrsu = true,
- 		.disallow_replay = true,
+ 		.disallow_replay = false,
  	},
  	.ilr = {
  		.optimize_edp_link_rate = true,
@@@ -1842,7 -1855,7 +1842,7 @@@ static struct link_encoder *dcn42b_link
  {
  	struct dcn20_link_encoder *enc20;
  
- 	if ((unsigned int)(eng_id - ENGINE_ID_DIGA) > ctx->dc->res_pool->res_cap->num_dig_link_enc)
+ 	if ((unsigned int)(eng_id - ENGINE_ID_DIGA) >= ctx->dc->res_pool->res_cap->num_dig_link_enc)
  		return NULL;
  
  	enc20 = kzalloc(sizeof(struct dcn20_link_encoder), GFP_KERNEL);
@@@ -1854,6 -1867,8 +1854,8 @@@
  			ctx,
  			&link_enc_feature,
  			&link_enc_regs[eng_id - ENGINE_ID_DIGA],
+ 			&le_shift,
+ 			&le_mask,
  			eng_id);
  
  	return &enc20->enc10.base;
@@@ -2002,11 -2017,10 +2004,10 @@@ static bool dcn42b_resource_construct
  	dc->caps.dmcub_support = true;
  	dc->caps.is_apu = true;
  	dc->caps.seamless_odm = true;
- 	dc->caps.zstate_support = false;
- 	dc->caps.ips_support = false;
+ 	dc->caps.zstate_support = true;
+ 	dc->caps.ips_support = true;
  	dc->caps.max_v_total = (1 << 15) - 1;
  	dc->caps.vtotal_limited_by_fp2 = true;
- 	dc->config.disable_ips = DMUB_IPS_DISABLE_ALL;
  
  	/* Color pipeline capabilities */
  	dc->caps.color.dpp.dcn_arch = 1;

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