From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07758C43461 for ; Thu, 10 Sep 2020 10:46:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99F4C20872 for ; Thu, 10 Sep 2020 10:46:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99F4C20872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23AA289226; Thu, 10 Sep 2020 10:46:08 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 074BE89226 for ; Thu, 10 Sep 2020 10:46:06 +0000 (UTC) IronPort-SDR: JDp/8lFCbAIB3AGcjxZHEfcwdgayx5qWyNVkvtNO6GW+VCIT4YH3r1cfI6vRQvSU1g9RwTfO9l FRpd+wUDm+8g== X-IronPort-AV: E=McAfee;i="6000,8403,9739"; a="176568582" X-IronPort-AV: E=Sophos;i="5.76,412,1592895600"; d="scan'208";a="176568582" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2020 03:46:06 -0700 IronPort-SDR: QyFr6ylQi5zGXKE5S5zHmmy/MYW0Sby+vz557f/Ba/RbWpSlc8EVg7EORfmKhPiaHq6DJnD17w wY1R+bFYFCBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,412,1592895600"; d="scan'208";a="341885522" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 10 Sep 2020 03:46:04 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 10 Sep 2020 13:46:03 +0300 Date: Thu, 10 Sep 2020 13:46:03 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: <20200910104603.GU6112@intel.com> References: <20200910095227.9466-1-jani.nikula@intel.com> <20200910095227.9466-2-jani.nikula@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200910095227.9466-2-jani.nikula@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915: move gen4 GCDGMBUS save/restore to display save/restore X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Sep 10, 2020 at 12:52:26PM +0300, Jani Nikula wrote: > Logically part of the display save/restore. No functional changes. > = Somewhat tempted to move this into the gmbus code proper. But we don't have a gmbus resume hook atm so would need to add one. In the meantime: Reviewed-by: Ville Syrj=E4l=E4 > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_suspend.c | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i= 915_suspend.c > index ed2be3489f8e..4a93247942b7 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -34,6 +34,8 @@ > = > static void i915_save_display(struct drm_i915_private *dev_priv) > { > + struct pci_dev *pdev =3D dev_priv->drm.pdev; > + > /* Display arbitration control */ > if (INTEL_GEN(dev_priv) <=3D 4) > dev_priv->regfile.saveDSPARB =3D I915_READ(DSPARB); > @@ -41,10 +43,20 @@ static void i915_save_display(struct drm_i915_private= *dev_priv) > /* save FBC interval */ > if (HAS_FBC(dev_priv) && INTEL_GEN(dev_priv) <=3D 4 && !IS_G4X(dev_priv= )) > dev_priv->regfile.saveFBC_CONTROL =3D I915_READ(FBC_CONTROL); > + > + if (IS_GEN(dev_priv, 4)) > + pci_read_config_word(pdev, GCDGMBUS, > + &dev_priv->regfile.saveGCDGMBUS); > } > = > static void i915_restore_display(struct drm_i915_private *dev_priv) > { > + struct pci_dev *pdev =3D dev_priv->drm.pdev; > + > + if (IS_GEN(dev_priv, 4)) > + pci_write_config_word(pdev, GCDGMBUS, > + dev_priv->regfile.saveGCDGMBUS); > + > /* Display arbitration */ > if (INTEL_GEN(dev_priv) <=3D 4) > I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB); > @@ -61,15 +73,10 @@ static void i915_restore_display(struct drm_i915_priv= ate *dev_priv) > = > int i915_save_state(struct drm_i915_private *dev_priv) > { > - struct pci_dev *pdev =3D dev_priv->drm.pdev; > int i; > = > i915_save_display(dev_priv); > = > - if (IS_GEN(dev_priv, 4)) > - pci_read_config_word(pdev, GCDGMBUS, > - &dev_priv->regfile.saveGCDGMBUS); > - > /* Cache mode state */ > if (INTEL_GEN(dev_priv) < 7) > dev_priv->regfile.saveCACHE_MODE_0 =3D I915_READ(CACHE_MODE_0); > @@ -102,12 +109,8 @@ int i915_save_state(struct drm_i915_private *dev_pri= v) > = > int i915_restore_state(struct drm_i915_private *dev_priv) > { > - struct pci_dev *pdev =3D dev_priv->drm.pdev; > int i; > = > - if (IS_GEN(dev_priv, 4)) > - pci_write_config_word(pdev, GCDGMBUS, > - dev_priv->regfile.saveGCDGMBUS); > i915_restore_display(dev_priv); > = > /* Cache mode state */ > -- = > 2.20.1 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx