From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 23:53:14 +0000 (+1000)
Subject: Merge remote-tracking branch 'imx-drm/imx-drm/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3cfb603d025ea19fd0cb23ac1ea0c141dff6f4f0;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'imx-drm/imx-drm/next'

# Conflicts:
#	drivers/gpu/drm/imx/ipuv3-plane.c
---

3cfb603d025ea19fd0cb23ac1ea0c141dff6f4f0
diff --cc drivers/gpu/drm/imx/ipuv3-plane.c
index fa5009705365e,26f2cc8321015..9c81cf708edc3
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@@ -590,8 -618,8 +625,8 @@@ static void ipu_plane_atomic_update(str
  	if (ipu_state->use_pre) {
  		axi_id = ipu_chan_assign_axi_id(ipu_plane->dma);
  		ipu_prg_channel_configure(ipu_plane->ipu_ch, axi_id,
- 					  drm_rect_width(&new_state->src) >> 16,
 -					  ipu_src_rect_width(state),
 -					  drm_rect_height(&state->src) >> 16,
++					  ipu_src_rect_width(new_state),
 +					  drm_rect_height(&new_state->src) >> 16,
  					  fb->pitches[0], fb->format->format,
  					  fb->modifier, &eba);
  	}
@@@ -623,10 -651,10 +658,10 @@@
  		break;
  	}
  
- 	ipu_dmfc_config_wait4eot(ipu_plane->dmfc, drm_rect_width(dst));
+ 	ipu_dmfc_config_wait4eot(ipu_plane->dmfc, ALIGN(drm_rect_width(dst), 8));
  
- 	width = drm_rect_width(&new_state->src) >> 16;
 -	width = ipu_src_rect_width(state);
 -	height = drm_rect_height(&state->src) >> 16;
++	width = ipu_src_rect_width(new_state);
 +	height = drm_rect_height(&new_state->src) >> 16;
  	info = drm_format_info(fb->format->format);
  	ipu_calculate_bursts(width, info->cpp[0], fb->pitches[0],
  			     &burstsize, &num_bursts);
@@@ -690,8 -717,8 +725,8 @@@
  
  		ipu_cpmem_zero(ipu_plane->alpha_ch);
  		ipu_cpmem_set_resolution(ipu_plane->alpha_ch,
- 					 drm_rect_width(&new_state->src) >> 16,
 -					 ipu_src_rect_width(state),
 -					 drm_rect_height(&state->src) >> 16);
++					 ipu_src_rect_width(new_state),
 +					 drm_rect_height(&new_state->src) >> 16);
  		ipu_cpmem_set_format_passthrough(ipu_plane->alpha_ch, 8);
  		ipu_cpmem_set_high_priority(ipu_plane->alpha_ch);
  		ipu_idmac_set_double_buffer(ipu_plane->alpha_ch, 1);