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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 53569C2D0DB for ; Tue, 28 Jan 2020 17:36:04 +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 2FC4320674 for ; Tue, 28 Jan 2020 17:36:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FC4320674 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 AE5D86E0EA; Tue, 28 Jan 2020 17:36:03 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F4316E0EA for ; Tue, 28 Jan 2020 17:36:02 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2020 09:36:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,374,1574150400"; d="scan'208";a="232032582" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga006.jf.intel.com with SMTP; 28 Jan 2020 09:35:59 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 28 Jan 2020 19:35:58 +0200 Date: Tue, 28 Jan 2020 19:35:58 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Stanislav Lisovskiy Message-ID: <20200128173558.GP13686@intel.com> References: <20200124084456.2961-1-stanislav.lisovskiy@intel.com> <20200124084456.2961-4-stanislav.lisovskiy@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200124084456.2961-4-stanislav.lisovskiy@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v16 3/7] drm/i915: Introduce parameterized DBUF_CTL 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 Fri, Jan 24, 2020 at 10:44:52AM +0200, Stanislav Lisovskiy wrote: > Now start using parameterized DBUF_CTL instead > of hardcoded, this would allow shorter access > functions when reading or storing entire state. > = > Tried to implement it in a MMIO_PIPE manner, however > DBUF_CTL1 address is higher than DBUF_CTL2, which > implies that we have to now subtract from base > rather than add. > = > v2: - Removed unneeded DBUF_CTL_DIST and DBUF_CTL_ADDR > macros. Started to use _PICK construct as suggested > by Matt Roper. > = > v3: - DBUF_CTL_S* to _DBUF_CTL_S*, changed X to "slice" > in macro(Ville Syrj=E4l=E4) > - Introduced enum for enumerating DBUF slices(Ville Syrj=E4l=E4) > = > Reviewed-by: Ville Syrj=E4l=E4 > Reviewed-by: Matt Roper > Signed-off-by: Stanislav Lisovskiy > --- > .../drm/i915/display/intel_display_power.c | 30 +++++++++++-------- > .../drm/i915/display/intel_display_power.h | 5 ++++ > drivers/gpu/drm/i915/i915_reg.h | 7 +++-- > drivers/gpu/drm/i915/intel_pm.c | 2 +- > 4 files changed, 28 insertions(+), 16 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers= /gpu/drm/i915/display/intel_display_power.c > index 5e1c601f0f99..a59efb24be92 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -4418,9 +4418,11 @@ void icl_dbuf_slices_update(struct drm_i915_privat= e *dev_priv, > return; > = > if (req_slices > hw_enabled_slices) > - ret =3D intel_dbuf_slice_set(dev_priv, DBUF_CTL_S2, true); > + ret =3D intel_dbuf_slice_set(dev_priv, > + _DBUF_CTL_S(DBUF_S2), true); > else > - ret =3D intel_dbuf_slice_set(dev_priv, DBUF_CTL_S2, false); > + ret =3D intel_dbuf_slice_set(dev_priv, > + _DBUF_CTL_S(DBUF_S2), false); > = > if (ret) > dev_priv->enabled_dbuf_slices_num =3D req_slices; > @@ -4428,14 +4430,16 @@ void icl_dbuf_slices_update(struct drm_i915_priva= te *dev_priv, > = > static void icl_dbuf_enable(struct drm_i915_private *dev_priv) > { > - I915_WRITE(DBUF_CTL_S1, I915_READ(DBUF_CTL_S1) | DBUF_POWER_REQUEST); > - I915_WRITE(DBUF_CTL_S2, I915_READ(DBUF_CTL_S2) | DBUF_POWER_REQUEST); > - POSTING_READ(DBUF_CTL_S2); > + I915_WRITE(_DBUF_CTL_S(DBUF_S1), > + I915_READ(_DBUF_CTL_S(DBUF_S1)) | DBUF_POWER_REQUEST); > + I915_WRITE(_DBUF_CTL_S(DBUF_S2), > + I915_READ(_DBUF_CTL_S(DBUF_S2)) | DBUF_POWER_REQUEST); > + POSTING_READ(_DBUF_CTL_S(DBUF_S2)); > = > udelay(10); > = > - if (!(I915_READ(DBUF_CTL_S1) & DBUF_POWER_STATE) || > - !(I915_READ(DBUF_CTL_S2) & DBUF_POWER_STATE)) > + if (!(I915_READ(_DBUF_CTL_S(DBUF_S1)) & DBUF_POWER_STATE) || > + !(I915_READ(_DBUF_CTL_S(DBUF_S2)) & DBUF_POWER_STATE)) > DRM_ERROR("DBuf power enable timeout\n"); > else > /* > @@ -4447,14 +4451,16 @@ static void icl_dbuf_enable(struct drm_i915_priva= te *dev_priv) > = > static void icl_dbuf_disable(struct drm_i915_private *dev_priv) > { > - I915_WRITE(DBUF_CTL_S1, I915_READ(DBUF_CTL_S1) & ~DBUF_POWER_REQUEST); > - I915_WRITE(DBUF_CTL_S2, I915_READ(DBUF_CTL_S2) & ~DBUF_POWER_REQUEST); > - POSTING_READ(DBUF_CTL_S2); > + I915_WRITE(_DBUF_CTL_S(DBUF_S1), > + I915_READ(_DBUF_CTL_S(DBUF_S1)) & ~DBUF_POWER_REQUEST); > + I915_WRITE(_DBUF_CTL_S(DBUF_S2), > + I915_READ(_DBUF_CTL_S(DBUF_S2)) & ~DBUF_POWER_REQUEST); > + POSTING_READ(_DBUF_CTL_S(DBUF_S2)); > = > udelay(10); > = > - if ((I915_READ(DBUF_CTL_S1) & DBUF_POWER_STATE) || > - (I915_READ(DBUF_CTL_S2) & DBUF_POWER_STATE)) > + if ((I915_READ(_DBUF_CTL_S(DBUF_S1)) & DBUF_POWER_STATE) || > + (I915_READ(_DBUF_CTL_S(DBUF_S2)) & DBUF_POWER_STATE)) > DRM_ERROR("DBuf power disable timeout!\n"); > else > /* > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers= /gpu/drm/i915/display/intel_display_power.h > index 2608a65af7fa..601e000ffd0d 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.h > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h > @@ -307,6 +307,11 @@ intel_display_power_put_async(struct drm_i915_privat= e *i915, > } > #endif > = > +enum dbuf_slice { > + DBUF_S1, > + DBUF_S2, > +}; > + > #define with_intel_display_power(i915, domain, wf) \ > for ((wf) =3D intel_display_power_get((i915), (domain)); (wf); \ > intel_display_power_put_async((i915), (domain), (wf)), (wf) =3D 0) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_= reg.h > index b93c4c18f05c..625be54d3eae 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -7748,9 +7748,10 @@ enum { > #define DISP_ARB_CTL2 _MMIO(0x45004) > #define DISP_DATA_PARTITION_5_6 (1 << 6) > #define DISP_IPC_ENABLE (1 << 3) > -#define DBUF_CTL _MMIO(0x45008) > -#define DBUF_CTL_S1 _MMIO(0x45008) > -#define DBUF_CTL_S2 _MMIO(0x44FE8) > +#define DBUF_CTL_ADDR1 0x45008 > +#define DBUF_CTL_ADDR2 0x44FE8 > +#define _DBUF_CTL_S(X) _MMIO(_PICK_EVEN(X, DBUF_CTL_ADDR1, DBUF_CTL_AD= DR2)) That's not at all what I meant. Also the 'X' is still there despite what the changelog says. #define _DBUF_CTL_S1 0x45008 #define _DBUF_CTL_S2 0x44FE8 #define DBUF_CTL_S(slice) _MMIO(_PICK_EVEN(slice, _DBUF_CTL_S1, _DBUF_CTL_S= 2)) > +#define DBUF_CTL _DBUF_CTL_S(0) > #define DBUF_POWER_REQUEST (1 << 31) > #define DBUF_POWER_STATE (1 << 30) > #define GEN7_MSG_CTL _MMIO(0x45010) > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index 04f94057d6b3..b8d78e26515c 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3660,7 +3660,7 @@ u8 intel_enabled_dbuf_slices_num(struct drm_i915_pr= ivate *dev_priv) > * only that 1 slice enabled until we have a proper way for on-demand > * toggling of the second slice. > */ > - if (0 && I915_READ(DBUF_CTL_S2) & DBUF_POWER_STATE) > + if (0 && I915_READ(_DBUF_CTL_S(DBUF_S2)) & DBUF_POWER_STATE) > enabled_dbuf_slices_num++; > = > return enabled_dbuf_slices_num; > -- = > 2.24.1.485.gad05a3d8e5 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx