Message ID | 1495558657-32130-1-git-send-email-vathsala.nagaraju@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
A bit of history on the commit message pointing the commit that introduced the issue is desired. With that in place feel free to use: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Tue, 2017-05-23 at 22:27 +0530, vathsala nagaraju wrote: > psr1 is also disabled for panel resolution greater than 32X20. > Added psr2 check to disable only for psr2 panels having resolution > greater than 32X20. > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Jim Bride <jim.bride@linux.intel.com> > Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com> > Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com> > --- > drivers/gpu/drm/i915/intel_psr.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c > index c3780d0..559f1ab 100644 > --- a/drivers/gpu/drm/i915/intel_psr.c > +++ b/drivers/gpu/drm/i915/intel_psr.c > @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp) > } > > /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ > - if (intel_crtc->config->pipe_src_w > 3200 || > - intel_crtc->config->pipe_src_h > 2000) { > + if (dev_priv->psr.psr2_support && > + (intel_crtc->config->pipe_src_w > 3200 || > + intel_crtc->config->pipe_src_h > 2000)) { > dev_priv->psr.psr2_support = false; > return false; > }
Hi, > -----Original Message----- > From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of > Patchwork > Sent: Tuesday, May 23, 2017 10:27 PM > To: Nagaraju@emeril.freedesktop.org; Nagaraju, Vathsala > <vathsala.nagaraju@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Subject: [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for > resolution greater than 32X20 (rev2) > > == Series Details == > > Series: drm/i915/psr: disable psr2 for resolution greater than 32X20 (rev2) > URL : https://patchwork.freedesktop.org/series/17737/ > State : success > > == Summary == > > Series 17737v2 drm/i915/psr: disable psr2 for resolution greater than 32X20 > https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/2/mbox/ > > fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:434s > fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:438s > fi-bdw-5557u failed to collect. IGT log at Patchwork_4788/fi-bdw-5557u/igt.log Something wrong in CI. This was just test to see if one occurrence but no. Investigating... > fi-bsw-n3050 failed to collect. IGT log at Patchwork_4788/fi-bsw-n3050/igt.log > fi-bxt-j4205 failed to collect. IGT log at Patchwork_4788/fi-bxt-j4205/igt.log > fi-byt-j1900 failed to collect. IGT log at Patchwork_4788/fi-byt-j1900/igt.log > fi-byt-n2820 failed to collect. IGT log at Patchwork_4788/fi-byt-n2820/igt.log > fi-hsw-4770 failed to collect. IGT log at Patchwork_4788/fi-hsw-4770/igt.log > fi-hsw-4770r failed to collect. IGT log at Patchwork_4788/fi-hsw-4770r/igt.log > fi-ilk-650 failed to collect. IGT log at Patchwork_4788/fi-ilk-650/igt.log fi-ivb- > 3520m failed to collect. IGT log at Patchwork_4788/fi-ivb-3520m/igt.log > fi-ivb-3770 failed to collect. IGT log at Patchwork_4788/fi-ivb-3770/igt.log > fi-kbl-7500u failed to collect. IGT log at Patchwork_4788/fi-kbl-7500u/igt.log > fi-kbl-7560u failed to collect. IGT log at Patchwork_4788/fi-kbl-7560u/igt.log > fi-skl-6260u failed to collect. IGT log at Patchwork_4788/fi-skl-6260u/igt.log > fi-skl-6700hq failed to collect. IGT log at Patchwork_4788/fi-skl-6700hq/igt.log > fi-skl-6700k failed to collect. IGT log at Patchwork_4788/fi-skl-6700k/igt.log > fi-skl-6770hq failed to collect. IGT log at Patchwork_4788/fi-skl-6770hq/igt.log > fi-snb-2520m failed to collect. IGT log at Patchwork_4788/fi-snb-2520m/igt.log > fi-snb-2600 failed to collect. IGT log at Patchwork_4788/fi-snb-2600/igt.log > > c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h- > 42m-41s UTC integration manifest > a293db4 drm/i915/psr: disable psr2 for resolution greater than 32X20 > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4788/ Jani Saarinen Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
On Tue, 23 May 2017, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote: > A bit of history on the commit message pointing the commit that > introduced the issue is desired. s/desired/absolutely required/. BR, Jani. > > With that in place feel free to use: > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > On Tue, 2017-05-23 at 22:27 +0530, vathsala nagaraju wrote: >> psr1 is also disabled for panel resolution greater than 32X20. >> Added psr2 check to disable only for psr2 panels having resolution >> greater than 32X20. >> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Cc: Jim Bride <jim.bride@linux.intel.com> >> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com> >> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com> >> --- >> drivers/gpu/drm/i915/intel_psr.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c >> index c3780d0..559f1ab 100644 >> --- a/drivers/gpu/drm/i915/intel_psr.c >> +++ b/drivers/gpu/drm/i915/intel_psr.c >> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp) >> } >> >> /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ >> - if (intel_crtc->config->pipe_src_w > 3200 || >> - intel_crtc->config->pipe_src_h > 2000) { >> + if (dev_priv->psr.psr2_support && >> + (intel_crtc->config->pipe_src_w > 3200 || >> + intel_crtc->config->pipe_src_h > 2000)) { >> dev_priv->psr.psr2_support = false; >> return false; >> } > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index c3780d0..559f1ab 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp) } /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ - if (intel_crtc->config->pipe_src_w > 3200 || - intel_crtc->config->pipe_src_h > 2000) { + if (dev_priv->psr.psr2_support && + (intel_crtc->config->pipe_src_w > 3200 || + intel_crtc->config->pipe_src_h > 2000)) { dev_priv->psr.psr2_support = false; return false; }
psr1 is also disabled for panel resolution greater than 32X20. Added psr2 check to disable only for psr2 panels having resolution greater than 32X20. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Jim Bride <jim.bride@linux.intel.com> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com> --- drivers/gpu/drm/i915/intel_psr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)