From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Souza, Jose" Subject: Re: [PATCH] drm/i915/ehl: inherit icl cdclk init/uninit Date: Wed, 17 Apr 2019 00:50:14 +0000 Message-ID: <289d6da893937d57abcd1932a4af8aec7c148d40.camel@intel.com> References: <20190416082852.18141-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0115288372==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id D737489C17 for ; Wed, 17 Apr 2019 00:50:18 +0000 (UTC) In-Reply-To: <20190416082852.18141-1-jani.nikula@intel.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Nikula, Jani" , "intel-gfx@lists.freedesktop.org" Cc: "De Marchi, Lucas" List-Id: intel-gfx@lists.freedesktop.org --===============0115288372== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=-LNwsx+VsrIPXuPAfXGLs" --=-LNwsx+VsrIPXuPAfXGLs Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=C3=A9 Roberto de Souza >=20 > Fixes: 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake conditional > code") > Cc: Jos=C3=A9 Roberto de Souza > Cc: Lucas De Marchi > Cc: Bob Paauwe > Cc: Rodrigo Vivi > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/intel_cdclk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > 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) >=3D 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) >=3D 11) > icl_uninit_cdclk(i915); > else if (IS_CANNONLAKE(i915)) > cnl_uninit_cdclk(i915); --=-LNwsx+VsrIPXuPAfXGLs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEVNG051EijGa0MiaQVenbO/mOWkkFAly2eDkACgkQVenbO/mO WklrkAf/cFzLr/cQqw2G5ola8tqEIOMfr8VCsiBwM/ETL5Js4yq8zGtiIN40L/we j2ryJP9xDYiHWrirb5W+hiwzdB3e2S8tJzaq8XcDIbxaHVXnieqbtxcTBukfNgJl 8mZcH8iIE3n3p8w5h9hQE1/jSFIK/uiR3ifxutGjGVfK60xzRMcaFU9lxECtIHPu rtSIkDcJCAv4VJR0KGiMjieZbRlWcLzT1IwETFOsnSg+AITEKb29sLGii729FATL ntBNI1zrJdInfIijXNlaRPkzw2EpJwxrYzlsfie3Kko157rED9gaeD+76uF+awBZ Hng5yO4OYmAkI3vThDN5/hxd0A43Nw== =cAs7 -----END PGP SIGNATURE----- --=-LNwsx+VsrIPXuPAfXGLs-- --===============0115288372== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0115288372==--