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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 0CB99C43331 for ; Wed, 13 Nov 2019 00:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB1DF2084F for ; Wed, 13 Nov 2019 00:58:13 +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="qYIKu66i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726960AbfKMA6N (ORCPT ); Tue, 12 Nov 2019 19:58:13 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:45555 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726957AbfKMA6N (ORCPT ); Tue, 12 Nov 2019 19:58:13 -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 47CR753PcCz9sPh; Wed, 13 Nov 2019 11:58:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573606689; bh=ZBkUHDMWS5AB+9yNCiNLnvsF5dXKFxRx6HUcHSjsaPQ=; h=Date:From:To:Cc:Subject:From; b=qYIKu66iwF18qDVT+9E8ozi4qN+qMIR4+z0NScyB1lUEpuPmZa9FFE3DfsBPz/Ye/ FtR+im7O0SBWPIfYhhWRbIjVD+34DmQ2/pXTpUUFgIIZQssU1g4SBssDnCcpPotgQV ib1eIOuKfTfoGR9LoSa2s9PuXuLtmzqcWGoNfcbws0Gk6Gl2cTYVyZihvwBnus73yl SJPez+a6W/vPUP4QpCxRZ77GYQPum2mhqZ7nwCsCpKRKlicUgA27L+STl8/FZUFeEw 0AXzJAPa/1MzkyG1KxDEv3GoZSIUSYEZhxT/1HG+Ip0En1tJTwtyIesG7Mx20EGjRo idSk0BOks1ADg== Date: Wed, 13 Nov 2019 11:58:08 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Imre Deak , Jon Bloomfield , Mika Kuoppala , Jani Nikula , Rodrigo Vivi , Chris Wilson , Joonas Lahtinen Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20191113115808.65d4138e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/kV_LBYPKme8Ev4xmxVLLmHe"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/kV_LBYPKme8Ev4xmxVLLmHe 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/i915_drv.c between commits: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA") 2f216a850715 ("drm/i915: update rawclk also on resume") from Linus' tree and commits: 5bcd53aa39f3 ("drm/i915: pass i915 to i915_driver_modeset_probe()") fd6fe087ca47 ("drm/i915/gt: Call intel_gt_sanitize() directly") 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.c index 3d717e282908,ccb5b566795f..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@@ -364,11 -296,14 +296,11 @@@ static int i915_driver_modeset_probe(st if (ret) goto cleanup_vga_client; =20 - intel_power_domains_init_hw(dev_priv, false); - /* must happen before intel_power_domains_init_hw() on VLV/CHV */ - intel_update_rawclk(i915); - + intel_power_domains_init_hw(i915, false); =20 - intel_csr_ucode_init(dev_priv); + intel_csr_ucode_init(i915); =20 - ret =3D intel_irq_install(dev_priv); + ret =3D intel_irq_install(i915); if (ret) goto cleanup_csr; =20 @@@ -2048,14 -1948,8 +1947,10 @@@ static int i915_drm_resume_early(struc =20 intel_display_power_resume_early(dev_priv); =20 - intel_sanitize_gt_powersave(dev_priv); -=20 intel_power_domains_resume(dev_priv); =20 + i915_rc6_ctx_wa_resume(dev_priv); + - intel_gt_sanitize(&dev_priv->gt, true); -=20 enable_rpm_wakeref_asserts(&dev_priv->runtime_pm); =20 return ret; --Sig_/kV_LBYPKme8Ev4xmxVLLmHe Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3LVSAACgkQAVBC80lX 0GxObAf9EK3RQ7S1TMgfyRmdBWJMZ5oAx/e6sgpyToIerf9imckzafTYAgoIss04 YJmorDSXjbBkrTcVB6whx+JvV/ULqLBQi9+PI3Af7QWM6pCoRpulCvnT8MGTYdSQ Zz/R1cUnbbHxhSCol6KJBXKonxShqKkWJrXMZtj7buFjVAhA9pwLTFh9Cek/Z/zx 14ju1J07Id65nAFueapYh90uJAC/dm+ookXkSvIt+m+Ar1yHJtkWCsa3CDmjFLLr z0mqCkwSEpkloWfFDPSRiP12eSm1R/qJWwYAxdqQrFsAkZTq+DZe/cJUZzPiA2YC 3d/yd/S6LqqHlpKiLSfR/Pg5XggIoA== =nfXk -----END PGP SIGNATURE----- --Sig_/kV_LBYPKme8Ev4xmxVLLmHe--