linux-next: manual merge of the amdgpu tree with the origin tree

--l1UPJwcmm8PocUO/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c

between commit:

  82730dba0cf9d ("drm/amd/display: Fix flip-done timeouts on mode1 reset")

=66rom the origin tree and commit:

  7e1b4bdb0e05a ("drm/amd/display: Fix flip-done timeouts on mode1 reset")

=66rom the amdgpu 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.

diff --combined drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index ff308ee40909e,079d4ccc88da6..0000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@@ -34,7 -34,7 +34,7 @@@
  #include "amdgpu_dm_plane.h"
  #include "amdgpu_dm_trace.h"
  #include "amdgpu_dm_debugfs.h"
- #include "amdgpu_dm_kunit_helpers.h"
+ #include "dm_helpers.h"
  #include "modules/inc/mod_power.h"
 =20
  #define HPD_DETECTION_PERIOD_uS 2000000
@@@ -287,8 -287,6 +287,6 @@@ static inline int amdgpu_dm_crtc_set_vb
  	 * is enabled. On DCE, vupdate is only needed in VRR mode.
  	 */
  	if (amdgpu_ip_version(adev, DCE_HWIP, 0) !=3D 0) {
- 		rc =3D amdgpu_dm_crtc_set_vupdate_irq(crtc, enable);
- 	} else if (dc_supports_vrr(dm->dc->ctx->dce_version)) {
  		if (enable) {
  			rc =3D amdgpu_irq_get(adev, &adev->vupdate_irq, irq_type);
  			drm_dbg_vbl(crtc->dev, "Get vupdate_irq ret=3D%d\n", rc);

--l1UPJwcmm8PocUO/
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpp//4ACgkQJNaLcl1U
h9A1kwf/SdKCo1GjhgNcsyCFEUOCinEwuZL4VrtU+7kc5/B6OH+xSc65aCbux22I
hVaaprttEFyyCN5BTd9/a1lR7Ygoe2gBVNz3qhSMgPQmh/Vd9Ux8mf2muTTH6xgM
Dyvw2bHnk3xmpE7uM7juWfx59HzhyOaT0yVRpwfznG9FL0y9i7jf7wCqEbGCCAtY
tnQSoteAaOJwKKuCk0CDlxfUZs0ANlSVCFPEh/w42RkuxK3qzdVYAexeBIw6Qnfj
djPWH8myzlKRkNkibqe2C3K0pUnFIUYXgVcUWfMvDWpc0pzgun3fDwz5k4zSpQkL
On/XN41/YkGZv+z9UrEndJHFX7aKBQ==
=PZsc
-----END PGP SIGNATURE-----

--l1UPJwcmm8PocUO/--