From: "Souza, Jose" Subject: Re: [PATCH v5 5/9] drm/i915/crc: Make IPS workaround generic Date: Thu, 7 Mar 2019 23:02:11 +0000 Message-ID: <3fd5544298f596d5ecb669954496cfac6d5dfeda.camel@intel.com> References: <20190306064728.8234-1-jose.souza@intel.com> <20190306064728.8234-5-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0040288352==" Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1E1C6E244 for ; Thu, 7 Mar 2019 23:02:13 +0000 (UTC) In-Reply-To: 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" List-Id: intel-gfx@lists.freedesktop.org --===============0040288352== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=-oO+2KWPtULokP/wRkz9g" --=-oO+2KWPtULokP/wRkz9g Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2019-03-07 at 12:18 -0800, Dhinakaran Pandiyan wrote: > On Tue, 2019-03-05 at 22:47 -0800, Jos=C3=A9 Roberto de Souza wrote: > > Other features like PSR2 also needs to be disabled while getting > > CRC > > so lets rename ips_force_disable to crc_enabled, drop all this > > checks > > for pipe A and HSW and BDW and make it generic and > > hsw_compute_ips_config() will take care of all the checks removed > > from here. > >=20 > > v2: Renaming and parameter changes to the functions that prepares > > the > > commit (Ville) > >=20 > > Cc: Dhinakaran Pandiyan > > Cc: Ville Syrj=C3=A4l=C3=A4 > > Reviewed-by: Rodrigo Vivi > > Signed-off-by: Jos=C3=A9 Roberto de Souza > > --- > > drivers/gpu/drm/i915/intel_display.c | 10 ++++-- > > drivers/gpu/drm/i915/intel_drv.h | 3 +- > > drivers/gpu/drm/i915/intel_pipe_crc.c | 47 +++++++++++------------ > > ---- > > 3 files changed, 29 insertions(+), 31 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c > > index 9312b3f35eb0..b3a5d8462251 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -6751,7 +6751,13 @@ static bool hsw_compute_ips_config(struct > > intel_crtc_state *crtc_state) > > if (!hsw_crtc_state_ips_capable(crtc_state)) > > return false; > > =20 > > - if (crtc_state->ips_force_disable) > > + /* > > + * When IPS gets enabled, the pipe CRC changes. Since IPS gets > > + * enabled and disabled dynamically based on package C states, > > + * user space can't make reliable use of the CRCs, so let's > > just > > + * completely disable it. > > + */ > > + if (crtc_state->crc_enabled) > > return false; > > =20 > > /* IPS should be fine as long as at least one plane is enabled. > > */ > > @@ -11687,7 +11693,7 @@ clear_intel_crtc_state(struct > > intel_crtc_state *crtc_state) > > saved_state->shared_dpll =3D crtc_state->shared_dpll; > > saved_state->dpll_hw_state =3D crtc_state->dpll_hw_state; > > saved_state->pch_pfit.force_thru =3D crtc_state- > > > pch_pfit.force_thru; > > - saved_state->ips_force_disable =3D crtc_state->ips_force_disable; > > + saved_state->crc_enabled =3D crtc_state->crc_enabled; > > if (IS_G4X(dev_priv) || > > IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > > saved_state->wm =3D crtc_state->wm; > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > > b/drivers/gpu/drm/i915/intel_drv.h > > index 5412373e2f98..2be64529e4a2 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -999,7 +999,8 @@ struct intel_crtc_state { > > struct intel_link_m_n fdi_m_n; > > =20 > > bool ips_enabled; > > - bool ips_force_disable; > > + > > + bool crc_enabled; > > =20 > > bool enable_fbc; > > =20 > > diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c > > b/drivers/gpu/drm/i915/intel_pipe_crc.c > > index 53d4ec68d3c4..af64597c5c6e 100644 > > --- a/drivers/gpu/drm/i915/intel_pipe_crc.c > > +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c > > @@ -280,15 +280,15 @@ static int ilk_pipe_crc_ctl_reg(enum > > intel_pipe_crc_source *source, > > return 0; > > } > > =20 > > -static void hsw_pipe_A_crc_wa(struct drm_i915_private *dev_priv, > > - bool enable) > > +static void > > +intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool > > enable) > > { > > + struct drm_i915_private *dev_priv =3D to_i915(crtc->base.dev); > > struct drm_device *dev =3D &dev_priv->drm; > We could eliminate this local. Done >=20 > > - struct intel_crtc *crtc =3D intel_get_crtc_for_pipe(dev_priv, > > PIPE_A); > > struct intel_crtc_state *pipe_config; > > struct drm_atomic_state *state; > > struct drm_modeset_acquire_ctx ctx; > > - int ret =3D 0; > > + int ret; > > =20 > > drm_modeset_acquire_init(&ctx, 0); > > =20 > > @@ -307,17 +307,9 @@ static void hsw_pipe_A_crc_wa(struct > > drm_i915_private *dev_priv, > > goto put_state; > > } > > =20 > > - if (HAS_IPS(dev_priv)) { > > - /* > > - * When IPS gets enabled, the pipe CRC changes. Since > > IPS gets > > - * enabled and disabled dynamically based on package C > > states, > > - * user space can't make reliable use of the CRCs, so > > let's just > > - * completely disable it. > > - */ > > - pipe_config->ips_force_disable =3D enable; > > - } > > + pipe_config->crc_enabled =3D enable; > > =20 > > - if (IS_HASWELL(dev_priv)) { > > + if (IS_HASWELL(dev_priv) && crtc->pipe =3D=3D PIPE_A) { > > pipe_config->pch_pfit.force_thru =3D enable; > > if (pipe_config->cpu_transcoder =3D=3D TRANSCODER_EDP && > > pipe_config->pch_pfit.enabled !=3D enable) > > @@ -343,8 +335,7 @@ static void hsw_pipe_A_crc_wa(struct > > drm_i915_private *dev_priv, > > static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, > > enum pipe pipe, > > enum intel_pipe_crc_source *source, > > - u32 *val, > > - bool set_wa) > > + u32 *val) > > { > > if (*source =3D=3D INTEL_PIPE_CRC_SOURCE_AUTO) > > *source =3D INTEL_PIPE_CRC_SOURCE_PIPE; > > @@ -357,10 +348,6 @@ static int ivb_pipe_crc_ctl_reg(struct > > drm_i915_private *dev_priv, > > *val =3D PIPE_CRC_ENABLE | PIPE_CRC_SOURCE_SPRITE_IVB; > > break; > > case INTEL_PIPE_CRC_SOURCE_PIPE: > > - if (set_wa && (IS_HASWELL(dev_priv) || > > - IS_BROADWELL(dev_priv)) && pipe =3D=3D PIPE_A) > > - hsw_pipe_A_crc_wa(dev_priv, true); > > - > > *val =3D PIPE_CRC_ENABLE | PIPE_CRC_SOURCE_PF_IVB; > > break; > > case INTEL_PIPE_CRC_SOURCE_NONE: > > @@ -418,8 +405,7 @@ static int skl_pipe_crc_ctl_reg(struct > > drm_i915_private *dev_priv, > > =20 > > static int get_new_crc_ctl_reg(struct drm_i915_private *dev_priv, > > enum pipe pipe, > > - enum intel_pipe_crc_source *source, u32 > > *val, > > - bool set_wa) > > + enum intel_pipe_crc_source *source, u32 > > *val) > > { > > if (IS_GEN(dev_priv, 2)) > > return i8xx_pipe_crc_ctl_reg(source, val); > > @@ -430,7 +416,7 @@ static int get_new_crc_ctl_reg(struct > > drm_i915_private *dev_priv, > > else if (IS_GEN_RANGE(dev_priv, 5, 6)) > > return ilk_pipe_crc_ctl_reg(source, val); > > else if (INTEL_GEN(dev_priv) < 9) > > - return ivb_pipe_crc_ctl_reg(dev_priv, pipe, source, > > val, set_wa); > > + return ivb_pipe_crc_ctl_reg(dev_priv, pipe, source, > > val); > > else > > return skl_pipe_crc_ctl_reg(dev_priv, pipe, source, > > val); > > } > > @@ -605,6 +591,7 @@ int intel_crtc_set_crc_source(struct drm_crtc > > *crtc, const char *source_name) > > intel_wakeref_t wakeref; > > u32 val =3D 0; /* shut up gcc */ > > int ret =3D 0; > > + bool enable; > > =20 > > if (display_crc_ctl_parse_source(source_name, &source) < 0) { > > DRM_DEBUG_DRIVER("unknown source %s\n", source_name); > > @@ -618,7 +605,11 @@ int intel_crtc_set_crc_source(struct drm_crtc > > *crtc, const char *source_name) > > return -EIO; > > } > > =20 > > - ret =3D get_new_crc_ctl_reg(dev_priv, crtc->index, &source, &val, > > true); > > + enable =3D source !=3D INTEL_PIPE_CRC_SOURCE_NONE; > > + if (enable) > > + intel_crtc_crc_setup_workarounds(to_intel_crtc(crtc), > > enable); > I personally, find it easier to read when we pass true/false, it's > just > clear that we have already worked out what do when enable is true. > intel_crtc_crc_setup_workaround(to_intel_crtc(crtc), true); Done >=20 >=20 > > + > > + ret =3D get_new_crc_ctl_reg(dev_priv, crtc->index, &source, > > &val); > > if (ret !=3D 0) > > goto out; > > =20 > > @@ -629,14 +620,14 @@ int intel_crtc_set_crc_source(struct drm_crtc > > *crtc, const char *source_name) > > if (!source) { > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > > vlv_undo_pipe_scramble_reset(dev_priv, crtc- > > > index); > > - else if ((IS_HASWELL(dev_priv) || > > - IS_BROADWELL(dev_priv)) && crtc->index =3D=3D > > PIPE_A) > > - hsw_pipe_A_crc_wa(dev_priv, false); > > } > > =20 > > pipe_crc->skipped =3D 0; > > =20 > > out: > > + if (!enable) > > + intel_crtc_crc_setup_workarounds(to_intel_crtc(crtc), > > enable); > > + > > intel_display_power_put(dev_priv, power_domain, wakeref); > > =20 > > return ret; > > @@ -652,7 +643,7 @@ void intel_crtc_enable_pipe_crc(struct > > intel_crtc > > *intel_crtc) > > if (!crtc->crc.opened) > > return; > > =20 > > - if (get_new_crc_ctl_reg(dev_priv, crtc->index, &pipe_crc- > > > source, &val, false) < 0) > > + if (get_new_crc_ctl_reg(dev_priv, crtc->index, &pipe_crc- > > > source, &val) < 0) >=20 > Now that 'ips_force_disable' is 'crc_enabled', I guess we should set > it > here for the sake of completeness. Anyway, doing that doesn't have > any > functional benefit since we weren't doing it earlier. This is only executed when doing a full modeset with CRC alread enabled, so crc_enabled will be kept set and the workarounds will be applied again, that is why we don't need to call it here. >=20 > Reviewed-by: Dhinakaran Pandiyan > > return; > > =20 > > /* Don't need pipe_crc->lock here, IRQs are not generated. */ --=-oO+2KWPtULokP/wRkz9g 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/mOWkkFAlyBovEACgkQVenbO/mO WklOdAf/ZvB9EZndkiASA3/H5yc6OgJguqr5RBewRfSDlhUs+egxiwIYdebRW9/F i0z3h/YjCa+JC9uduaUnneYgzjvaR6LN42npo0XvHs+vjl2ssJnELVoI6VLPfEW4 2vW8vuKI8wtaKOR1VkhJUmpbXYvyrbXhvR+1kwQcMfRFkFpdc1mKHYdPCFe37WNl vn9xEbkoNXL/ocGVSSTNF2gdAMPGP10WP749VBIKEzUvA5RViLTk9qeoi58I7Y3b 0MsvEqOX3lk8KMFZ2G4NOaG/Fu27Iq8tQgZq1XsOWSRxjgjE1O94qzhnn/RSP5z3 ul7CUT+kgDXhwNhW4VYA+ePBBtFzNw== =llcC -----END PGP SIGNATURE----- --=-oO+2KWPtULokP/wRkz9g-- --===============0040288352== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0040288352==--