From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC6F1C33C9B for ; Wed, 8 Jan 2020 01:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE816206F0 for ; Wed, 8 Jan 2020 01:15:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="lYRkCjgn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726634AbgAHBPd (ORCPT ); Tue, 7 Jan 2020 20:15:33 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:60867 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725601AbgAHBPc (ORCPT ); Tue, 7 Jan 2020 20:15:32 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47srsD5Jtzz9sRl; Wed, 8 Jan 2020 12:15:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1578446129; bh=WLW9s4Q6bkfwP6wWJS5exAJsayPk4KKaWV7JLajorGA=; h=Date:From:To:Cc:Subject:From; b=lYRkCjgnuv1rq7lOgF5SDeVPUH+redG/CrYRA9hDhpQPjLkryYyzbB/v3CxUlmsx+ AqjMl5Haap3euKwXkBEwnG3PYt537VXayBH+mE3LnYjI9v6m/e7tzIwx7a9gALT+xy 3135NW0/GCQ4ekUVUUL5L1Cfo3FePkN7Evhi2XpEI10mAUL/YlzvM7BpybP4J4mvVQ aQ4uv9MxBAoqiMKyJKTGMQZnzqNXN0zPMkfUWWqkDYoMY8qZiATklgLtomPogy2cg7 SygUd6ZTD3NO76wCDeeRYKjzUpukZSO13oOMFGlA02knynBZXJEKsmU00UVyEBv5CO vxqHHLPFvwcLg== Date: Wed, 8 Jan 2020 12:15:28 +1100 From: Stephen Rothwell To: Dave Airlie , DRI , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics Cc: Linux Next Mailing List , Linux Kernel Mailing List , Manasi Navare , Ville =?UTF-8?B?U3lyasOkbMOk?= Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20200108121528.5a800a65@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/0S8l_O_FFF2_z+jPteUKeci"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/0S8l_O_FFF2_z+jPteUKeci Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: 2b2c4a83d69d ("drm/i915/dp: Disable Port sync mode correctly on teardown") from the drm-intel-fixes tree and commit: 773b4b54351c ("drm/i915: Move stuff from haswell_crtc_disable() into enco= der .post_disable()") from the drm tree. I fixed it up (I applied the change to icl_disable_transcoder_port_sync() from the former commit in its new location - see patch 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. From: Stephen Rothwell Date: Wed, 8 Jan 2020 12:12:45 +1100 Subject: [PATCH] drm/i915: fixup for "drm/i915/dp: Disable Port sync mode correctly on teardown" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/display/intel_ddi.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i91= 5/display/intel_ddi.c index c9ba7d7f3787..e535a3b85575 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3860,8 +3860,6 @@ static void icl_disable_transcoder_port_sync(const st= ruct intel_crtc_state *old_ { struct intel_crtc *crtc =3D to_intel_crtc(old_crtc_state->uapi.crtc); struct drm_i915_private *dev_priv =3D to_i915(crtc->base.dev); - i915_reg_t reg; - u32 trans_ddi_func_ctl2_val; =20 if (old_crtc_state->master_transcoder =3D=3D INVALID_TRANSCODER) return; @@ -3869,10 +3867,7 @@ static void icl_disable_transcoder_port_sync(const s= truct intel_crtc_state *old_ DRM_DEBUG_KMS("Disabling Transcoder Port Sync on Slave Transcoder %s\n", transcoder_name(old_crtc_state->cpu_transcoder)); =20 - reg =3D TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder); - trans_ddi_func_ctl2_val =3D ~(PORT_SYNC_MODE_ENABLE | - PORT_SYNC_MODE_MASTER_SELECT_MASK); - I915_WRITE(reg, trans_ddi_func_ctl2_val); + I915_WRITE(TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder), 0); } =20 static void intel_ddi_post_disable(struct intel_encoder *encoder, --=20 2.24.0 --=20 Cheers, Stephen Rothwell --Sig_/0S8l_O_FFF2_z+jPteUKeci Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4VLTAACgkQAVBC80lX 0GxQ0Af+JWKZelrEALDfQfGtW3uISstZ63INkQ42kft7UNa2Kjv/0IV5oZlwuq0u w9g23iZGl4xdwu9mAGA8EoomH2haNoMLKlhWHOnPspKwy9DW2vDg0hqijPMla6OC vC/F0wzRn9BerGsjow6wErxfjV2KEiqJTqoykr+t083tqsf94JsqFclXgh8EoxvG BScp8pePlvWk8FpBYEfcP8JpKkYZa+NPgVEHjzN2knBzBe/YNzApdth6fnD27VZl lBzvND0LbdQ02OgDkH9uhCRXMBOsKMSklGQ5EvpumG0CkG2NwRe8qv7UtFbXqQyX WBzAlymRoDMvQZP0AEUvsPkRhoWygg== =5PNq -----END PGP SIGNATURE----- --Sig_/0S8l_O_FFF2_z+jPteUKeci--