From: "Souza, Jose" <jose.souza@intel.com>
To: "Nikula, Jani" <jani.nikula@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Cc: "De Marchi, Lucas" <lucas.demarchi@intel.com>
Subject: Re: [PATCH] drm/i915/ehl: inherit icl cdclk init/uninit
Date: Wed, 17 Apr 2019 00:50:14 +0000 [thread overview]
Message-ID: <289d6da893937d57abcd1932a4af8aec7c148d40.camel@intel.com> (raw)
In-Reply-To: <20190416082852.18141-1-jani.nikula@intel.com>
[-- Attachment #1.1: Type: text/plain, Size: 1704 bytes --]
On Tue, 2019-04-16 at 11:28 +0300, Jani Nikula wrote:
> The cdclk init/uninit code was changed by commit 93a643f29bcb
> ("drm/i915/cdclk: have only one init/uninit function") between the
> versions of commit 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake
> conditional code"). What got merged fails to do cdclk init/uninit on
> ehl.
Thanks for catching up this
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
>
> Fixes: 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake conditional
> code")
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_cdclk.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_cdclk.c
> b/drivers/gpu/drm/i915/intel_cdclk.c
> index 7f060ea..ae40a86 100644
> --- a/drivers/gpu/drm/i915/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> @@ -2034,7 +2034,7 @@ static void cnl_uninit_cdclk(struct
> drm_i915_private *dev_priv)
> */
> void intel_cdclk_init(struct drm_i915_private *i915)
> {
> - if (IS_ICELAKE(i915))
> + if (INTEL_GEN(i915) >= 11)
> icl_init_cdclk(i915);
> else if (IS_CANNONLAKE(i915))
> cnl_init_cdclk(i915);
> @@ -2053,7 +2053,7 @@ void intel_cdclk_init(struct drm_i915_private
> *i915)
> */
> void intel_cdclk_uninit(struct drm_i915_private *i915)
> {
> - if (IS_ICELAKE(i915))
> + if (INTEL_GEN(i915) >= 11)
> icl_uninit_cdclk(i915);
> else if (IS_CANNONLAKE(i915))
> cnl_uninit_cdclk(i915);
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-04-17 0:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 8:28 [PATCH] drm/i915/ehl: inherit icl cdclk init/uninit Jani Nikula
2019-04-16 10:24 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-04-16 12:39 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-04-16 15:18 ` [PATCH] " Bob Paauwe
2019-04-17 0:50 ` Souza, Jose [this message]
2019-04-18 16:30 ` Jani Nikula
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=289d6da893937d57abcd1932a4af8aec7c148d40.camel@intel.com \
--to=jose.souza@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=lucas.demarchi@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox