From: Daniel Vetter <daniel@ffwll.ch> To: "Jindal, Sonika" <sonika.jindal@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Lyude <cpaul@redhat.com>, stable@vger.kernel.org, Rodrigo Vivi <rodrigo.vivi@intel.com>, Durgadoss R <durgadoss.r@intel.com>, "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>, Daniel Vetter <daniel.vetter@intel.com> Subject: Re: [PATCH 2/7] drm/i915/psr: Try to program link training times correctly Date: Fri, 20 May 2016 09:33:03 +0200 [thread overview] Message-ID: <20160520073303.GR27098@phenom.ffwll.local> (raw) In-Reply-To: <573D9A5A.4010004@intel.com> On Thu, May 19, 2016 at 04:20:02PM +0530, Jindal, Sonika wrote: > > > On 5/18/2016 10:17 PM, Daniel Vetter wrote: > >Oops. Hw default for programming these fields to 0 is "skip link > >training". Display won't take that too well usually. > But we were defaulting it to value 0, which means 500us for both TP1 and TP2 > or TP3 time. > I dont think it means skip link training. This is just to set the time for > the patterns. > Skip aux handshake can happen if bit 12 of SRD_CTL is set. > > Does this solution help in fixing the bug mentioned here? See the other thread, I misread and yes it does help. -Daniel > > > > >v2: Unbotch the math a bit. > > > >v3: Drop debug hunk. > > > >Tested-by: Lyude <cpaul@redhat.com> > >Cc: Lyude <cpaul@redhat.com> > >Cc: stable@vger.kernel.org > >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95176 > >Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > >Cc: Sonika Jindal <sonika.jindal@intel.com> > >Cc: Durgadoss R <durgadoss.r@intel.com> > >Cc: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com> > >Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > >--- > > drivers/gpu/drm/i915/intel_psr.c | 55 ++++++++++++++++++++++++++++++++++------ > > 1 file changed, 47 insertions(+), 8 deletions(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c > >index c3abae4bc596..a788d1e9589b 100644 > >--- a/drivers/gpu/drm/i915/intel_psr.c > >+++ b/drivers/gpu/drm/i915/intel_psr.c > >@@ -280,7 +280,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) > > * with the 5 or 6 idle patterns. > > */ > > uint32_t idle_frames = max(6, dev_priv->vbt.psr.idle_frames); > >- uint32_t val = 0x0; > >+ uint32_t val = EDP_PSR_ENABLE; > >+ > >+ val |= max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT; > >+ val |= idle_frames << EDP_PSR_IDLE_FRAME_SHIFT; > > if (IS_HASWELL(dev)) > > val |= EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES; > >@@ -288,14 +291,50 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) > > if (dev_priv->psr.link_standby) > > val |= EDP_PSR_LINK_STANDBY; > >- I915_WRITE(EDP_PSR_CTL, val | > >- max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT | > >- idle_frames << EDP_PSR_IDLE_FRAME_SHIFT | > >- EDP_PSR_ENABLE); > >+ if (dev_priv->vbt.psr.tp1_wakeup_time > 5) > >+ val |= EDP_PSR_TP1_TIME_2500us; > >+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 1) > >+ val |= EDP_PSR_TP1_TIME_500us; > >+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 0) > >+ val |= EDP_PSR_TP1_TIME_100us; > >+ else > >+ val |= EDP_PSR_TP1_TIME_0us; > >+ > >+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) > >+ val |= EDP_PSR_TP2_TP3_TIME_2500us; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) > >+ val |= EDP_PSR_TP2_TP3_TIME_500us; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) > >+ val |= EDP_PSR_TP2_TP3_TIME_100us; > >+ else > >+ val |= EDP_PSR_TP2_TP3_TIME_0us; > >+ > >+ if (intel_dp_source_supports_hbr2(intel_dp) && > >+ drm_dp_tps3_supported(intel_dp->dpcd)) > >+ val |= EDP_PSR_TP1_TP3_SEL; > >+ else > >+ val |= EDP_PSR_TP1_TP2_SEL; > >+ > >+ I915_WRITE(EDP_PSR_CTL, val); > >+ > >+ if (!dev_priv->psr.psr2_support) > >+ return; > >+ > >+ /* FIXME: selective update is probably totally broken because it doesn't > >+ * mesh at all with our frontbuffer tracking. And the hw alone isn't > >+ * good enough. */ > >+ val = EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE; > >+ > >+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) > >+ val |= EDP_PSR2_TP2_TIME_2500; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) > >+ val |= EDP_PSR2_TP2_TIME_500; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) > >+ val |= EDP_PSR2_TP2_TIME_100; > >+ else > >+ val |= EDP_PSR2_TP2_TIME_50; > >- if (dev_priv->psr.psr2_support) > >- I915_WRITE(EDP_PSR2_CTL, EDP_PSR2_ENABLE | > >- EDP_SU_TRACK_ENABLE | EDP_PSR2_TP2_TIME_100); > >+ I915_WRITE(EDP_PSR2_CTL, val); > > } > > static bool intel_psr_match_conditions(struct intel_dp *intel_dp) > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: "Jindal, Sonika" <sonika.jindal@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, stable@vger.kernel.org, Rodrigo Vivi <rodrigo.vivi@intel.com>, Daniel Vetter <daniel.vetter@intel.com> Subject: Re: [PATCH 2/7] drm/i915/psr: Try to program link training times correctly Date: Fri, 20 May 2016 09:33:03 +0200 [thread overview] Message-ID: <20160520073303.GR27098@phenom.ffwll.local> (raw) In-Reply-To: <573D9A5A.4010004@intel.com> On Thu, May 19, 2016 at 04:20:02PM +0530, Jindal, Sonika wrote: > > > On 5/18/2016 10:17 PM, Daniel Vetter wrote: > >Oops. Hw default for programming these fields to 0 is "skip link > >training". Display won't take that too well usually. > But we were defaulting it to value 0, which means 500us for both TP1 and TP2 > or TP3 time. > I dont think it means skip link training. This is just to set the time for > the patterns. > Skip aux handshake can happen if bit 12 of SRD_CTL is set. > > Does this solution help in fixing the bug mentioned here? See the other thread, I misread and yes it does help. -Daniel > > > > >v2: Unbotch the math a bit. > > > >v3: Drop debug hunk. > > > >Tested-by: Lyude <cpaul@redhat.com> > >Cc: Lyude <cpaul@redhat.com> > >Cc: stable@vger.kernel.org > >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95176 > >Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > >Cc: Sonika Jindal <sonika.jindal@intel.com> > >Cc: Durgadoss R <durgadoss.r@intel.com> > >Cc: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com> > >Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > >--- > > drivers/gpu/drm/i915/intel_psr.c | 55 ++++++++++++++++++++++++++++++++++------ > > 1 file changed, 47 insertions(+), 8 deletions(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c > >index c3abae4bc596..a788d1e9589b 100644 > >--- a/drivers/gpu/drm/i915/intel_psr.c > >+++ b/drivers/gpu/drm/i915/intel_psr.c > >@@ -280,7 +280,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) > > * with the 5 or 6 idle patterns. > > */ > > uint32_t idle_frames = max(6, dev_priv->vbt.psr.idle_frames); > >- uint32_t val = 0x0; > >+ uint32_t val = EDP_PSR_ENABLE; > >+ > >+ val |= max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT; > >+ val |= idle_frames << EDP_PSR_IDLE_FRAME_SHIFT; > > if (IS_HASWELL(dev)) > > val |= EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES; > >@@ -288,14 +291,50 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) > > if (dev_priv->psr.link_standby) > > val |= EDP_PSR_LINK_STANDBY; > >- I915_WRITE(EDP_PSR_CTL, val | > >- max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT | > >- idle_frames << EDP_PSR_IDLE_FRAME_SHIFT | > >- EDP_PSR_ENABLE); > >+ if (dev_priv->vbt.psr.tp1_wakeup_time > 5) > >+ val |= EDP_PSR_TP1_TIME_2500us; > >+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 1) > >+ val |= EDP_PSR_TP1_TIME_500us; > >+ else if (dev_priv->vbt.psr.tp1_wakeup_time > 0) > >+ val |= EDP_PSR_TP1_TIME_100us; > >+ else > >+ val |= EDP_PSR_TP1_TIME_0us; > >+ > >+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) > >+ val |= EDP_PSR_TP2_TP3_TIME_2500us; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) > >+ val |= EDP_PSR_TP2_TP3_TIME_500us; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) > >+ val |= EDP_PSR_TP2_TP3_TIME_100us; > >+ else > >+ val |= EDP_PSR_TP2_TP3_TIME_0us; > >+ > >+ if (intel_dp_source_supports_hbr2(intel_dp) && > >+ drm_dp_tps3_supported(intel_dp->dpcd)) > >+ val |= EDP_PSR_TP1_TP3_SEL; > >+ else > >+ val |= EDP_PSR_TP1_TP2_SEL; > >+ > >+ I915_WRITE(EDP_PSR_CTL, val); > >+ > >+ if (!dev_priv->psr.psr2_support) > >+ return; > >+ > >+ /* FIXME: selective update is probably totally broken because it doesn't > >+ * mesh at all with our frontbuffer tracking. And the hw alone isn't > >+ * good enough. */ > >+ val = EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE; > >+ > >+ if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 5) > >+ val |= EDP_PSR2_TP2_TIME_2500; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 1) > >+ val |= EDP_PSR2_TP2_TIME_500; > >+ else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time > 0) > >+ val |= EDP_PSR2_TP2_TIME_100; > >+ else > >+ val |= EDP_PSR2_TP2_TIME_50; > >- if (dev_priv->psr.psr2_support) > >- I915_WRITE(EDP_PSR2_CTL, EDP_PSR2_ENABLE | > >- EDP_SU_TRACK_ENABLE | EDP_PSR2_TP2_TIME_100); > >+ I915_WRITE(EDP_PSR2_CTL, val); > > } > > static bool intel_psr_match_conditions(struct intel_dp *intel_dp) > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-05-20 7:33 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-18 16:47 [PATCH 1/7] drm/i915: Enable edp psr error interrupts on hsw Daniel Vetter 2016-05-18 16:47 ` [PATCH 2/7] drm/i915/psr: Try to program link training times correctly Daniel Vetter 2016-05-18 17:39 ` [Intel-gfx] " Ville Syrjälä 2016-05-18 17:39 ` Ville Syrjälä 2016-05-18 18:04 ` Daniel Vetter 2016-05-18 18:09 ` Ville Syrjälä 2016-05-18 18:09 ` Ville Syrjälä 2016-05-19 10:50 ` Jindal, Sonika 2016-05-20 7:33 ` Daniel Vetter [this message] 2016-05-20 7:33 ` Daniel Vetter 2016-05-18 16:47 ` [PATCH 3/7] drm/i915/psr: Make idle_frames sensible again Daniel Vetter 2016-05-18 17:46 ` Ville Syrjälä 2016-05-25 22:52 ` Rodrigo Vivi 2016-05-18 16:47 ` [PATCH 4/7] drm/i915/psr: Skip aux handeshake if the vbt tells us to Daniel Vetter 2016-05-18 17:47 ` Ville Syrjälä 2016-05-18 16:47 ` [PATCH 5/7] drm/i915/psr: Order DP aux transactions correctly Daniel Vetter 2016-05-18 17:51 ` Ville Syrjälä 2016-05-18 16:47 ` [PATCH 6/7] drm/i915/psr: Use ->get_aux_send_ctl functions Daniel Vetter 2016-05-18 18:09 ` Ville Syrjälä 2016-05-18 16:47 ` [PATCH 7/7] drm/i915/psr: Implement PSR2 w/a for skl/kbl Daniel Vetter 2016-05-18 18:22 ` Ville Syrjälä 2016-05-18 18:46 ` Daniel Vetter 2016-05-18 22:07 ` Runyan, Arthur J 2016-05-19 7:14 ` [PATCH] drm/i915/psr: Implement PSR2 w/a for gen9 Daniel Vetter 2016-05-19 8:55 ` Jindal, Sonika 2016-05-20 7:53 ` Daniel Vetter 2016-05-18 17:17 ` ✗ Ro.CI.BAT: failure for series starting with [1/7] drm/i915: Enable edp psr error interrupts on hsw Patchwork 2016-05-18 18:26 ` [PATCH 1/7] " Ville Syrjälä 2016-05-19 9:36 ` Jindal, Sonika 2016-05-19 8:01 ` ✗ Ro.CI.BAT: warning for series starting with [1/7] drm/i915: Enable edp psr error interrupts on hsw (rev2) Patchwork 2016-05-20 7:48 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160520073303.GR27098@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=cpaul@redhat.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dhinakaran.pandiyan@intel.com \ --cc=durgadoss.r@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=rodrigo.vivi@intel.com \ --cc=sonika.jindal@intel.com \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.