From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 4/6] drm/i915: remove HAS_PC8 check Date: Thu, 20 Mar 2014 15:29:58 +0200 Message-ID: <1395322198.17233.8.camel@intelbox> References: <1394233957-3904-1-git-send-email-przanoni@gmail.com> <1394233957-3904-5-git-send-email-przanoni@gmail.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0456599402==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D3086E076 for ; Thu, 20 Mar 2014 06:30:31 -0700 (PDT) In-Reply-To: <1394233957-3904-5-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org --===============0456599402== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-8BwxTzDabKJgNpLloB/C" --=-8BwxTzDabKJgNpLloB/C Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2014-03-07 at 20:12 -0300, Paulo Zanoni wrote: > From: Paulo Zanoni >=20 > Now that PC8 is part of runtime PM, the check is useless. >=20 > Signed-off-by: Paulo Zanoni Looks ok. It could be applied already after 2/6. Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.c | 10 ++-------- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 3 files changed, 2 insertions(+), 13 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index 2c62e0c..55f0181 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -841,10 +841,7 @@ static void snb_runtime_suspend(struct drm_i915_priv= ate *dev_priv) > =20 > static void hsw_runtime_suspend(struct drm_i915_private *dev_priv) > { > - struct drm_device *dev =3D dev_priv->dev; > - > - if (HAS_PC8(dev)) > - hsw_enable_pc8(dev_priv); > + hsw_enable_pc8(dev_priv); > } > =20 > static void snb_runtime_resume(struct drm_i915_private *dev_priv) > @@ -861,10 +858,7 @@ static void snb_runtime_resume(struct drm_i915_priva= te *dev_priv) > =20 > static void hsw_runtime_resume(struct drm_i915_private *dev_priv) > { > - struct drm_device *dev =3D dev_priv->dev; > - > - if (HAS_PC8(dev)) > - hsw_disable_pc8(dev_priv); > + hsw_disable_pc8(dev_priv); > } > =20 > static int intel_runtime_suspend(struct device *device) > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index 309852d..1debc412 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1997,7 +1997,6 @@ struct drm_i915_cmd_table { > #define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi) > #define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg) > #define HAS_PSR(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev)) > -#define HAS_PC8(dev) (IS_HASWELL(dev)) /* XXX HSW:ULX */ > #define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev)) > =20 > #define INTEL_PCH_DEVICE_ID_MASK 0xff00 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 35f65c1..d6092be 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6818,8 +6818,6 @@ void hsw_enable_pc8(struct drm_i915_private *dev_pr= iv) > struct drm_device *dev =3D dev_priv->dev; > uint32_t val; > =20 > - WARN_ON(!HAS_PC8(dev)); > - > DRM_DEBUG_KMS("Enabling package C8+\n"); > =20 > if (dev_priv->pch_id =3D=3D INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) { > @@ -6838,8 +6836,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_p= riv) > struct drm_device *dev =3D dev_priv->dev; > uint32_t val; > =20 > - WARN_ON(!HAS_PC8(dev)); > - > DRM_DEBUG_KMS("Disabling package C8+\n"); > =20 > hsw_restore_lcpll(dev_priv); --=-8BwxTzDabKJgNpLloB/C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTKu1WAAoJEORIIAnNuWDFhlgIAM5fUUUqXqQ59ugfgM9yLvkh 3VleZFqOyrwUvrlj8byJBdrAsQ1nGCz1CkxPjBM3oeGQo0boebArllUw3CQl7Pp5 x/5UjFNZu5bvFgmwrdrjns9qAM6xVMKc4SM6z2S0c4T/RrNaVI49CKsHyNBUDcjb 9BXzBwPuGPinyk0KdKk/jhp+dLv0SgSepwtGzasJBZb3kprOeDNQpt8b6R0jZ9fx osx++PLvQiBGY0AtcDZ3syYmlB4+3CsH2ZuyhSZBbLj+okuDqkd42z8jgWpEqlrU MAStd+rLaDBU1VwAGF4jk8iIiQW27wd9jTCybmrNyL7tJY6evRpq/h5NbB9gJgo= =4zCg -----END PGP SIGNATURE----- --=-8BwxTzDabKJgNpLloB/C-- --===============0456599402== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0456599402==--