linux-next: manual merge of the mali-dp tree with the drm-misc tree

Stephen Rothwell
2018-03-05T23:52:01Z

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

Hi Liviu,

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

drivers/gpu/drm/arm/malidp_planes.c

between commit:

81af63a4af82 ("drm: Don't pass clip to drm_atomic_helper_check_plane_state()")

from the drm-misc tree and commit:

4968211e7b8f ("drm: mali-dp: Uninitialized variable in malidp_se_check_scaling()")

from the mali-dp 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/arm/malidp_planes.c
index ee32361c87ac,b2d11df6b5e1..000000000000
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@@ -147,7 -147,13 +146,9 @@@ static int malidp_se_check_scaling(stru
if (!crtc_state)
return -EINVAL;

- if (crtc_state->enable)
- drm_mode_get_hv_timing(&crtc_state->mode,
- &clip.x2, &clip.y2);
-
+ mc = to_malidp_crtc_state(crtc_state);
+
- ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+ ret = drm_atomic_helper_check_plane_state(state, crtc_state,
0, INT_MAX, true, true);
if (ret)
return ret;

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