Messages in this thread | | | Date | Thu, 5 Nov 2020 11:58:08 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-msm tree with the drm-misc tree |
| |
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
between commit:
29b77ad7b9ca ("drm/atomic: Pass the full state to CRTC atomic_check")
from the drm-misc tree and commit:
91693cbc13c2 ("drm/msm/dpu: Add newline to printks")
from the drm-msm 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/msm/disp/dpu1/dpu_crtc.c index e55be2922c2f,d4662e8184cc..000000000000 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@@ -844,12 -838,12 +844,12 @@@ static int dpu_crtc_atomic_check(struc goto end; } - mode = &state->adjusted_mode; + mode = &crtc_state->adjusted_mode; - DPU_DEBUG("%s: check", dpu_crtc->name); + DPU_DEBUG("%s: check\n", dpu_crtc->name); /* force a full mode set if active state changed */ - if (state->active_changed) - state->mode_changed = true; + if (crtc_state->active_changed) + crtc_state->mode_changed = true; memset(pipe_staged, 0, sizeof(pipe_staged)); [unhandled content-type:application/pgp-signature] | |