From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org> Cc: "Linux-Next Mailing List" <linux-next@vger.kernel.org>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Lucas De Marchi" <lucas.demarchi@intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Fri, 5 Jan 2018 12:00:33 +1100 [thread overview] Message-ID: <20180105120033.2446d6d2@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_cdclk.c between commit: 30414f3010af ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") from the drm-intel-fixes tree and commit: 2aa97491da8a ("drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL") 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/intel_cdclk.c index 60cf4e58389a,9c5ceb98d48f..000000000000 --- a/drivers/gpu/drm/i915/intel_cdclk.c +++ b/drivers/gpu/drm/i915/intel_cdclk.c @@@ -917,11 -994,9 +988,9 @@@ static void skl_set_cdclk(struct drm_i9 { int cdclk = cdclk_state->cdclk; int vco = cdclk_state->vco; - u32 freq_select, pcu_ack, cdclk_ctl; - u32 freq_select; ++ u32 freq_select, cdclk_ctl; int ret; - WARN_ON((cdclk == 24000) != (vco == 0)); - mutex_lock(&dev_priv->pcu_lock); ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL, SKL_CDCLK_PREPARE_FOR_CHANGE, @@@ -934,8 -1009,16 +1003,16 @@@ return; } - /* set CDCLK_CTL */ + /* Choose frequency for this cdclk */ switch (cdclk) { + default: + WARN_ON(cdclk != dev_priv->cdclk.hw.ref); + WARN_ON(vco != 0); + /* fall through */ + case 308571: + case 337500: + freq_select = CDCLK_FREQ_337_308; + break; case 450000: case 432000: freq_select = CDCLK_FREQ_450_432;
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org> Cc: Jani Nikula <jani.nikula@intel.com>, Lucas De Marchi <lucas.demarchi@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Rodrigo Vivi <rodrigo.vivi@intel.com> Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Fri, 5 Jan 2018 12:00:33 +1100 [thread overview] Message-ID: <20180105120033.2446d6d2@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_cdclk.c between commit: 30414f3010af ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") from the drm-intel-fixes tree and commit: 2aa97491da8a ("drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL") 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/intel_cdclk.c index 60cf4e58389a,9c5ceb98d48f..000000000000 --- a/drivers/gpu/drm/i915/intel_cdclk.c +++ b/drivers/gpu/drm/i915/intel_cdclk.c @@@ -917,11 -994,9 +988,9 @@@ static void skl_set_cdclk(struct drm_i9 { int cdclk = cdclk_state->cdclk; int vco = cdclk_state->vco; - u32 freq_select, pcu_ack, cdclk_ctl; - u32 freq_select; ++ u32 freq_select, cdclk_ctl; int ret; - WARN_ON((cdclk == 24000) != (vco == 0)); - mutex_lock(&dev_priv->pcu_lock); ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL, SKL_CDCLK_PREPARE_FOR_CHANGE, @@@ -934,8 -1009,16 +1003,16 @@@ return; } - /* set CDCLK_CTL */ + /* Choose frequency for this cdclk */ switch (cdclk) { + default: + WARN_ON(cdclk != dev_priv->cdclk.hw.ref); + WARN_ON(vco != 0); + /* fall through */ + case 308571: + case 337500: + freq_select = CDCLK_FREQ_337_308; + break; case 450000: case 432000: freq_select = CDCLK_FREQ_450_432; _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2018-01-05 1:00 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-05 1:00 Stephen Rothwell [this message] 2018-01-05 1:00 ` linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell -- 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 2022-02-22 17:03 broonie 2022-02-22 17:03 ` 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 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=20180105120033.2446d6d2@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=lucas.demarchi@intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=ville.syrjala@linux.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.