From: broonie@kernel.org To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Jani Nikula <jani.nikula@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Matt Roper <matthew.d.roper@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Tue, 22 Feb 2022 17:03:33 +0000 [thread overview] Message-ID: <20220222170333.694165-1-broonie@kernel.org> (raw) Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commit: c5274e86da5fe ("drm/i915/snps: convert to drm device based logging") 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. diff --cc drivers/gpu/drm/i915/display/intel_snps_phy.c index 92ff654f54f56,8573a458811a0..0000000000000 --- a/drivers/gpu/drm/i915/display/intel_snps_phy.c +++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c @@@ -28,13 -29,13 +29,13 @@@ void intel_snps_phy_wait_for_calibratio enum phy phy; for_each_phy_masked(phy, ~0) { - if (!intel_phy_is_snps(dev_priv, phy)) + if (!intel_phy_is_snps(i915, phy)) continue; - if (intel_de_wait_for_clear(dev_priv, ICL_PHY_MISC(phy), + if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy), DG2_PHY_DP_TX_ACK_MASK, 25)) - DRM_ERROR("SNPS PHY %c failed to calibrate after 25ms.\n", - phy_name(phy)); + drm_err(&i915->drm, "SNPS PHY %c failed to calibrate after 25ms.\n", - phy); ++ phy_name(phy)); } }
WARNING: multiple messages have this Message-ID (diff)
From: broonie@kernel.org To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Jani Nikula <jani.nikula@intel.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Tue, 22 Feb 2022 17:03:33 +0000 [thread overview] Message-ID: <20220222170333.694165-1-broonie@kernel.org> (raw) Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commit: c5274e86da5fe ("drm/i915/snps: convert to drm device based logging") 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. diff --cc drivers/gpu/drm/i915/display/intel_snps_phy.c index 92ff654f54f56,8573a458811a0..0000000000000 --- a/drivers/gpu/drm/i915/display/intel_snps_phy.c +++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c @@@ -28,13 -29,13 +29,13 @@@ void intel_snps_phy_wait_for_calibratio enum phy phy; for_each_phy_masked(phy, ~0) { - if (!intel_phy_is_snps(dev_priv, phy)) + if (!intel_phy_is_snps(i915, phy)) continue; - if (intel_de_wait_for_clear(dev_priv, ICL_PHY_MISC(phy), + if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy), DG2_PHY_DP_TX_ACK_MASK, 25)) - DRM_ERROR("SNPS PHY %c failed to calibrate after 25ms.\n", - phy_name(phy)); + drm_err(&i915->drm, "SNPS PHY %c failed to calibrate after 25ms.\n", - phy); ++ phy_name(phy)); } }
next reply other threads:[~2022-02-22 17:03 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-22 17:03 broonie [this message] 2022-02-22 17:03 ` linux-next: manual merge of the drm tree with the drm-intel-fixes tree broonie -- strict thread matches above, loose matches on Subject: below -- 2024-03-07 2:10 Stephen Rothwell 2024-03-07 8:27 ` Joonas Lahtinen 2023-04-17 14:39 broonie 2023-04-17 14:39 ` broonie 2022-05-17 1:26 Stephen Rothwell 2022-05-17 1:26 ` Stephen Rothwell 2022-02-25 16:14 broonie 2022-02-25 16:14 ` broonie 2020-05-08 3:50 Stephen Rothwell 2020-05-08 3:50 ` Stephen Rothwell 2020-05-07 2:43 Stephen Rothwell 2020-05-07 2:43 ` Stephen Rothwell 2020-01-22 0:37 Stephen Rothwell 2020-01-22 0:37 ` Stephen Rothwell 2020-01-08 1:15 Stephen Rothwell 2020-01-08 1:15 ` Stephen Rothwell 2020-01-08 1:10 Stephen Rothwell 2020-01-08 1:10 ` Stephen Rothwell 2020-01-08 1:04 Stephen Rothwell 2020-01-08 1:04 ` Stephen Rothwell 2020-01-08 2:28 ` Stephen Rothwell 2020-01-08 2:28 ` Stephen Rothwell 2019-10-31 0:33 Stephen Rothwell 2019-10-31 0:33 ` Stephen Rothwell 2019-11-08 0:42 ` Stephen Rothwell 2019-11-08 0:42 ` Stephen Rothwell 2019-11-08 0:42 ` Stephen Rothwell 2018-01-05 1:00 Stephen Rothwell 2018-01-05 1:00 ` Stephen Rothwell 2017-07-21 1:26 Stephen Rothwell 2017-07-21 1:26 ` Stephen Rothwell 2017-06-14 0:56 Stephen Rothwell 2017-06-14 0:56 ` Stephen Rothwell 2017-06-14 0:50 Stephen Rothwell 2017-06-09 2:26 Stephen Rothwell 2017-06-08 2:53 Stephen Rothwell 2017-06-08 2:53 ` Stephen Rothwell 2017-03-30 1:14 Stephen Rothwell 2017-03-30 1:08 Stephen Rothwell 2017-03-30 1:08 ` Stephen Rothwell 2017-03-22 0:00 Stephen Rothwell 2017-03-22 0:00 ` Stephen Rothwell 2017-03-27 17:14 ` Paul McKenney 2017-03-21 23:57 Stephen Rothwell 2017-03-21 23:57 ` Stephen Rothwell 2017-03-21 0:28 Stephen Rothwell 2017-03-21 0:28 ` Stephen Rothwell 2016-06-14 2:10 Stephen Rothwell 2016-06-14 2:10 ` Stephen Rothwell 2015-12-22 23:06 Stephen Rothwell 2015-12-22 23:06 ` Stephen Rothwell 2015-12-09 2:35 Stephen Rothwell 2015-12-09 2:35 ` Stephen Rothwell 2015-12-03 14:51 Mark Brown 2015-12-03 15:49 ` Jani Nikula 2015-12-03 15:49 ` Jani Nikula 2015-12-03 14:47 Mark Brown 2015-12-03 14:52 ` Imre Deak 2015-08-17 3:23 Stephen Rothwell 2015-08-17 3:23 ` Stephen Rothwell 2015-06-05 5:46 mpe@ellerman.id.au 2015-06-05 8:03 ` Jani Nikula 2015-06-05 8:03 ` Jani Nikula 2015-06-09 1:58 ` Stephen Rothwell 2015-06-09 1:58 ` Stephen Rothwell 2015-03-16 2:30 Stephen Rothwell 2015-03-16 2:30 ` Stephen Rothwell 2015-03-16 13:43 ` Xi Ruoyao 2015-03-16 15:04 ` Jani Nikula 2014-12-03 2:27 Stephen Rothwell 2014-12-03 2:27 ` Stephen Rothwell 2014-12-03 8:24 ` Jani Nikula 2014-12-03 8:24 ` Jani Nikula 2014-12-03 8:28 ` Stephen Rothwell 2014-11-17 3:04 Stephen Rothwell 2014-11-17 3:04 ` Stephen Rothwell 2014-07-23 2:38 Stephen Rothwell 2014-07-23 2:38 ` Stephen Rothwell 2014-07-09 4:06 Stephen Rothwell 2014-05-22 5:44 Stephen Rothwell 2014-05-22 5:40 Stephen Rothwell 2014-05-07 3:24 Stephen Rothwell 2013-10-28 5:46 Stephen Rothwell 2013-10-28 5:46 ` Stephen Rothwell 2013-10-28 6:12 ` Stephen Rothwell 2013-10-28 6:12 ` Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220222170333.694165-1-broonie@kernel.org \ --to=broonie@kernel.org \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=matthew.d.roper@intel.com \ --cc=tvrtko.ursulin@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.