* linux-next: manual merge of the imx-drm tree with the drm tree
@ 2021-04-06 5:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-04-06 5:14 UTC (permalink / raw)
To: Lucas Stach, Dave Airlie, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Maxime Ripard,
Philipp Zabel, Sebastian Reichel
[-- Attachment #1: Type: text/plain, Size: 2615 bytes --]
Hi all,
Today's linux-next merge of the imx-drm tree got a conflict in:
drivers/gpu/drm/imx/ipuv3-plane.c
between commits:
ba5c1649465d ("drm: Rename plane atomic_check state names")
41016fe1028e ("drm: Rename plane->state variables in atomic update and disable")
from the drm tree and commit:
49c826e1941a ("drm/imx: Add 8 pixel alignment fix")
from the imx-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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/imx/ipuv3-plane.c
index fa5009705365,26f2cc832101..000000000000
--- 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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-06 5:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-06 5:14 linux-next: manual merge of the imx-drm tree with the drm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox