From: "Souza, Jose" Subject: Re: [PATCH 2/4] drm/i915: Disable PSR2 while getting pipe CRC Date: Fri, 15 Feb 2019 00:17:33 +0000 Message-ID: References: <20190214020206.26046-1-jose.souza@intel.com> <20190214020206.26046-2-jose.souza@intel.com> <5f19297be64769cf27315ceb8e7c290f49841a52.camel@intel.com> <423e5c36da7e0ba33cf5c87ec2453a41b4d0f144.camel@intel.com> <9c4175649739a71f25b9b4aaf2f485f2468af59a.camel@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0768039883==" Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37CF46E153 for ; Fri, 15 Feb 2019 00:17:35 +0000 (UTC) In-Reply-To: <9c4175649739a71f25b9b4aaf2f485f2468af59a.camel@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: "intel-gfx@lists.freedesktop.org" , "Pandiyan, Dhinakaran" Cc: "Runyan, Arthur J" List-Id: intel-gfx@lists.freedesktop.org --===============0768039883== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=-XprrsJE0nLSa7AOHF/w1" --=-XprrsJE0nLSa7AOHF/w1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2019-02-14 at 16:10 -0800, Pandiyan, Dhinakaran wrote: > On Thu, 2019-02-14 at 15:19 -0800, Souza, Jose wrote: > > On Thu, 2019-02-14 at 11:00 -0800, Dhinakaran Pandiyan wrote: > > > On Wed, 2019-02-13 at 18:02 -0800, Jos=C3=A9 Roberto de Souza wrote: > > > > As stated in CRC_CTL spec, after PSR entry state CRC will not > > > > be > > > > calculated anymore what is not a problem as IGT tests do some > > > > screen > > > > change and then request the pipe CRC right after the change so > > > > PSR > > > > will go to idle state and only will entry again after at least > > > > 6 > > > > idles frames. > > > >=20 > > > > But for PSR2 it is more problematic as any change to the screen > > > > could > > > > trigger a selective/partial update causing the CRC value not to > > > > be > > > > calculated over the full frame. > > >=20 > > > Okay, that reasoning runs counter to my understanding. My > > > understanding > > > is that the whole frame is fetched and processed at the pipe > > > level > > > but > > > the DDI sends selective blocks of pixels. So, if the CRC's are > > > calculated at the pipe level, the CRC should be for the full > > > frame > > > with > > > PSR2 having no effect? Checking bspec, I see there are DDI CRCs > > > as > > > well, which should reflect the partial frame that PSR2 sends. > > >=20 > > > To get a better understanding, I'd like to know what the source > > > for > > > mismatching CRCs is? > >=20 > > Well the naming is misleading for newer gens, before BDW this was a > > pipe register(8067) but now it is a DDI register(7536) but the > > register > > offset was kept the same. > Do we even read this register DDI_CRC_CTL? Don't see it defined in > i915_reg.h or referenced in intel_pipe_crc.c. We do: PIPE_CRC_CTL(). #define _PIPE_CRC_CTL_A 0x60050 > > In my testing hardware generate 4 interruptions with wrong CRC > > values > > then stops forever probably because vblank interruptions are off. > Yeah, my guess is that power management is affecting the CRC > generation > rather than pipe CRC's being calculated only on the SU update blocks. >=20 >=20 > > >=20 > > > > So here it disables PSR2 and keep it disabled while user is > > > > requesting pipe CRC. > > > >=20 > > > > BSpec: 7536 > > > >=20 > > > > Cc: Dhinakaran Pandiyan > > > > Cc: Ville Syrj=C3=A4l=C3=A4 > > > > Signed-off-by: Jos=C3=A9 Roberto de Souza > > > > --- > > > > drivers/gpu/drm/i915/i915_drv.h | 1 + > > > > drivers/gpu/drm/i915/intel_drv.h | 1 + > > > > drivers/gpu/drm/i915/intel_pipe_crc.c | 10 ++++++++++ > > > > drivers/gpu/drm/i915/intel_psr.c | 23 > > > > +++++++++++++++++++++++ > > > > 4 files changed, 35 insertions(+) > > > >=20 > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > > > > b/drivers/gpu/drm/i915/i915_drv.h > > > > index 17fe942eaafa..609e9c5bd453 100644 > > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > > @@ -520,6 +520,7 @@ struct i915_psr { > > > > bool sink_not_reliable; > > > > bool irq_aux_error; > > > > u16 su_x_granularity; > > > > + bool pipe_crc_enabled; > > > > }; > > > > =20 > > > > enum intel_pch { > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > > > > b/drivers/gpu/drm/i915/intel_drv.h > > > > index 3398b28c053b..40ce7a600585 100644 > > > > --- a/drivers/gpu/drm/i915/intel_drv.h > > > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > > > @@ -2103,6 +2103,7 @@ void intel_psr_short_pulse(struct > > > > intel_dp > > > > *intel_dp); > > > > int intel_psr_wait_for_idle(const struct intel_crtc_state > > > > *new_crtc_state, > > > > u32 *out_value); > > > > bool intel_psr_enabled(struct intel_dp *intel_dp); > > > > +void intel_psr_crc_prepare_or_finish(struct drm_i915_private > > > > *dev_priv, enum pipe pipe, bool prepare); > > > > =20 > > > > /* intel_quirks.c */ > > > > void intel_init_quirks(struct drm_i915_private *dev_priv); > > > > diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c > > > > b/drivers/gpu/drm/i915/intel_pipe_crc.c > > > > index a8554dc4f196..5d8772399f60 100644 > > > > --- a/drivers/gpu/drm/i915/intel_pipe_crc.c > > > > +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c > > > > @@ -583,6 +583,14 @@ int intel_crtc_verify_crc_source(struct > > > > drm_crtc > > > > *crtc, const char *source_name, > > > > return -EINVAL; > > > > } > > > > =20 > > > > +static inline void intel_crtc_crc_prepare_or_finish(struct > > > > drm_crtc > > > > *crtc, bool prepare) > > > > +{ > > > > + struct drm_i915_private *dev_priv =3D to_i915(crtc->dev); > > > > + struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > > > > + > > > > + intel_psr_crc_prepare_or_finish(dev_priv, intel_crtc- > > > > >pipe, > > > > prepare); > > > > +} > > > > + > > > > int intel_crtc_set_crc_source(struct drm_crtc *crtc, const > > > > char > > > > *source_name) > > > > { > > > > struct drm_i915_private *dev_priv =3D to_i915(crtc->dev); > > > > @@ -609,6 +617,8 @@ int intel_crtc_set_crc_source(struct > > > > drm_crtc > > > > *crtc, const char *source_name) > > > > if (ret !=3D 0) > > > > goto out; > > > > =20 > > > > + intel_crtc_crc_prepare_or_finish(crtc, source !=3D > > > > INTEL_PIPE_CRC_SOURCE_NONE); > > > > + > > > > pipe_crc->source =3D source; > > > > I915_WRITE(PIPE_CRC_CTL(crtc->index), val); > > > > POSTING_READ(PIPE_CRC_CTL(crtc->index)); > > > > diff --git a/drivers/gpu/drm/i915/intel_psr.c > > > > b/drivers/gpu/drm/i915/intel_psr.c > > > > index 08967836b48e..9c93138988aa 100644 > > > > --- a/drivers/gpu/drm/i915/intel_psr.c > > > > +++ b/drivers/gpu/drm/i915/intel_psr.c > > > > @@ -577,6 +577,9 @@ static bool intel_psr2_config_valid(struct > > > > intel_dp *intel_dp, > > > > return false; > > > > } > > > > =20 > > > > + if (dev_priv->psr.pipe_crc_enabled) > > > > + return false; > > > > + > > > > return true; > > > > } > > > > =20 > > > > @@ -1291,3 +1294,23 @@ bool intel_psr_enabled(struct intel_dp > > > > *intel_dp) > > > > =20 > > > > return ret; > > > > } > > > > + > > > > +void intel_psr_crc_prepare_or_finish(struct drm_i915_private > > > > *dev_priv, enum pipe pipe, bool prepare) > > > > +{ > > > > + bool fastset =3D false; > > > > + > > > > + if (!CAN_PSR(dev_priv)) > > > > + return; > > > > + > > > > + mutex_lock(&dev_priv->psr.lock); > > > > + > > > > + if (dev_priv->psr.pipe =3D=3D pipe) { > > > > + dev_priv->psr.pipe_crc_enabled =3D prepare; > > > > + fastset =3D !prepare || dev_priv- > > > > >psr.psr2_enabled; > > > > + } > > > > + > > > > + mutex_unlock(&dev_priv->psr.lock); > > > > + > > > > + if (fastset) > > > > + intel_psr_fastset_force(dev_priv); > > > > +} --=-XprrsJE0nLSa7AOHF/w1 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/mOWkkFAlxmBRsACgkQVenbO/mO WknhYAf9F9/NSwdnw/8N13JX/Jw+3O4MUof06pvO42QC1xcYrAwDhHLvnSmZY525 W5V3TScbaJX1/uWHNxXi17mdZDlJ4ev5AjOPPzGgI/lblBIz8pguTYb0e8idPxwq 6kz/qnd4GQbitZzmR8mMVam6qIRRis3a9Hed8E5BFfQ11RWlX9LVjufm9TD7U4GG yPEuSG/2MJvQFovEObdEPef2gX5PiVHyRJtKpnHUCYyt3nY4zG3QSpZq64ftitqN AF/XFBbJs+xZzQjLw2KNgbkrPQJ8/yS9Ud0JFpHNFU7/v2om4klwyOrRRIqKnS4i kdvtJHXpjMiJYdsnccqHNiqyYTGiSQ== =Km8p -----END PGP SIGNATURE----- --=-XprrsJE0nLSa7AOHF/w1-- --===============0768039883== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0768039883==--