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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

between commits:

  3141e3d61469b ("drm/amd/display: Check for tg ops in dce110_set_avmute")
  443290d70b01e ("drm/amd/display: Add AV mute wait frames to dce110_set_avmute")

from the drm-fixes tree and commit:

  414da24137ace ("drm/amd/display: Add AV mute wait frames to dce110_set_avmute")

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.

This is a pretty clear example of the sorts of issues the constant
cherry picking causes.

diff --combined drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index f5b3a2eff94a0,f91ce2b4b1bfa..0000000000000
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@@ -607,11 -607,10 +607,10 @@@ dce110_translate_regamma_to_hw_format(c
  }
  
  static bool
- dce110_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx,
- 				const struct dc_stream_state *stream)
+ dce110_set_output_transfer_func(struct set_output_transfer_func_params *params)
  {
- 	(void)dc;
- 	struct transform *xfm = pipe_ctx->plane_res.xfm;
+ 	struct transform *xfm = params->xfm;
+ 	const struct dc_stream_state *stream = params->stream;
  
  	xfm->funcs->opp_power_on_regamma_lut(xfm, true);
  	xfm->regamma_params.hw_points_num = GAMMA_HW_POINTS_NUM;
@@@ -1348,10 -1347,7 +1347,7 @@@ void dce110_set_avmute(struct pipe_ctx 
  		 * process the mute state, especially after link re-establishment
  		 * with HDMI 2.0 scrambling enabled.
  		 */
- 		if (enable && pipe_ctx->stream_res.tg &&
- 		    pipe_ctx->stream_res.tg->funcs->is_tg_enabled &&
- 		    pipe_ctx->stream_res.tg->funcs->wait_for_state &&
- 		    pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg)) {
+ 		if (enable && pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg)) {
  			int i;
  
  			pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
@@@ -2826,23 -2822,26 +2822,26 @@@ static void program_surface_visibility(
  
  }
  
- static void program_gamut_remap(struct pipe_ctx *pipe_ctx)
+ static void program_gamut_remap(struct program_gamut_remap_params *params)
  {
+ 	struct transform *xfm = params->xfm;
+ 	const struct dc_stream_state *stream = params->stream;
  	int i = 0;
  	struct xfm_grph_csc_adjustment adjust;
+ 
  	memset(&adjust, 0, sizeof(adjust));
  	adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS;
  
  
- 	if (pipe_ctx->stream->gamut_remap_matrix.enable_remap == true) {
+ 	if (stream->gamut_remap_matrix.enable_remap == true) {
  		adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW;
  
  		for (i = 0; i < CSC_TEMPERATURE_MATRIX_SIZE; i++)
  			adjust.temperature_matrix[i] =
- 				pipe_ctx->stream->gamut_remap_matrix.matrix[i];
+ 				stream->gamut_remap_matrix.matrix[i];
  	}
  
- 	pipe_ctx->plane_res.xfm->funcs->transform_set_gamut_remap(pipe_ctx->plane_res.xfm, &adjust);
+ 	xfm->funcs->transform_set_gamut_remap(xfm, &adjust);
  }
  static void update_plane_addr(const struct dc *dc,
  		struct pipe_ctx *pipe_ctx)
@@@ -3188,13 -3187,13 +3187,13 @@@ static void dce110_program_front_end_fo
  				plane_state->rotation);
  
  	/* Moved programming gamma from dc to hwss */
- 	if (pipe_ctx->plane_state->update_flags.bits.full_update ||
- 			pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||
- 			pipe_ctx->plane_state->update_flags.bits.gamma_change)
+ 	if (pipe_ctx->plane_state->update_bits.full_update ||
+ 			pipe_ctx->plane_state->update_bits.in_transfer_func_change ||
+ 			pipe_ctx->plane_state->update_bits.gamma_change)
  		hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);
  
- 	if (pipe_ctx->plane_state->update_flags.bits.full_update)
- 		hws->funcs.set_output_transfer_func(dc, pipe_ctx, pipe_ctx->stream);
+ 	if (pipe_ctx->plane_state->update_bits.full_update)
+ 		hwss_set_output_transfer_func(dc, pipe_ctx);
  
  	DC_LOG_SURFACE(
  			"Pipe:%d %p: addr hi:0x%x, "

Attachment: signature.asc
Description: PGP signature