On Fri, 26 May 2017, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: > I believe we need to cc:stable on this right?! > > Jani, is this ok to go ahead and merge after stable is cc'ed? Please add this, and it'll all happen automagically. Fixes: acf45d11050a ("drm/i915/psr: disable psr2 for resolution greater than 32X20") Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Cc: Jim Bride <jim.bride@xxxxxxxxxxxxxxx> Cc: Vathsala Nagaraju <vathsala.nagaraju@xxxxxxxxx> Cc: Daniel Vetter <daniel.vetter@xxxxxxxxx> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx Cc: <stable@xxxxxxxxxxxxxxx> # v4.11+ BR, Jani. > > On Thu, May 25, 2017 at 9:43 AM, vathsala nagaraju > <vathsala.nagaraju@xxxxxxxxx> 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. >> >> issue was introduced by >> commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba" >> commit message: "PSR2 is restricted to work with panel resolutions >> upto 3200x2000, move the check to intel_psr_match_conditions and fully >> block psr." >> >> v2: (Rodrigo) >> Add previous commit details which introduced the issue >> >> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >> Cc: Jim Bride <jim.bride@xxxxxxxxxxxxxxx> >> Cc: Yaroslav Shabalin <yaroslav.shabalin@xxxxxxxxx> >> Reported-by: Yaroslav Shabalin <yaroslav.shabalin@xxxxxxxxx> >> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@xxxxxxxxx> >> --- >> 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; >> } >> -- >> 1.9.1 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx