| Message ID | 20240307131027.66be2266@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with the drm-intel-fixes tree | expand |
Quoting Stephen Rothwell (2024-03-07 04:10:27) > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_dp.c > > between commit: > > 984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from init_connector()") > > from the drm-intel-fixes tree and commit: > > e60cff453b82 ("drm/i915/dp: Enable DP tunnel BW allocation mode") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/i915/display/intel_dp.c > index 94d2a15d8444,6ece2c563c7a..000000000000 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@@ -5699,9 -5702,13 +5702,16 @@@ intel_dp_detect(struct drm_connector *c > goto out; > } > > + ret = intel_dp_tunnel_detect(intel_dp, ctx); > + if (ret == -EDEADLK) > + return ret; > + > + if (ret == 1) > + intel_connector->base.epoch_counter++; > + > + if (!intel_dp_is_edp(intel_dp)) > + intel_psr_init_dpcd(intel_dp); > + Hi, This is the right resolution, should be cleared up shortly once the drm-intel-fixes PR is pulled. Regards, Joonas > intel_dp_detect_dsc_caps(intel_dp, intel_connector); > > intel_dp_configure_mst(intel_dp);
diff --cc drivers/gpu/drm/i915/display/intel_dp.c index 94d2a15d8444,6ece2c563c7a..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp.c
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp.c between commit: 984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from init_connector()") from the drm-intel-fixes tree and commit: e60cff453b82 ("drm/i915/dp: Enable DP tunnel BW allocation mode") 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.