<div dir="ltr">patch merged to dinq. thanks for the patch</div> <div class="gmail_quote"><div dir="ltr">On Tue, Jan 10, 2017 at 12:48 PM Vivi, Rodrigo <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Reviewed-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com" class="gmail_msg" target="_blank">rodrigo.vivi@intel.com</a>> On Tue, 2017-01-10 at 12:32 +0530, vathsala nagaraju wrote: > PSR2 is restricted to work with panel resolutions upto 3200x2000, > move the check to intel_psr_match_conditions and fully block psr. > > Cc: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com" class="gmail_msg" target="_blank">rodrigo.vivi@intel.com</a>> > Cc: Jim Bride <<a href="mailto:jim.bride@linux.intel.com" class="gmail_msg" target="_blank">jim.bride@linux.intel.com</a>> > Suggested-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com" class="gmail_msg" target="_blank">rodrigo.vivi@intel.com</a>> > Signed-off-by: Vathsala Nagaraju <<a href="mailto:vathsala.nagaraju@intel.com" class="gmail_msg" target="_blank">vathsala.nagaraju@intel.com</a>> > --- > drivers/gpu/drm/i915/intel_psr.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c > index 6aca8ff..f2ca2a9 100644 > --- a/drivers/gpu/drm/i915/intel_psr.c > +++ b/drivers/gpu/drm/i915/intel_psr.c > @@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp) > return false; > } > > + /* 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) { > + dev_priv->psr.psr2_support = false; > + return false; > + } > + > dev_priv->psr.source_ok = true; > return true; > } > @@ -425,7 +432,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > struct drm_device *dev = intel_dig_port->base.base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > - struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc); > > if (!HAS_PSR(dev_priv)) { > DRM_DEBUG_KMS("PSR not supported on this platform\n"); > @@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) > hsw_psr_setup_vsc(intel_dp); > > if (dev_priv->psr.psr2_support) { > - /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ > - if (crtc->config->pipe_src_w > 3200 || > - crtc->config->pipe_src_h > 2000) > - dev_priv->psr.psr2_support = false; > - else > - skl_psr_setup_su_vsc(intel_dp); > + skl_psr_setup_su_vsc(intel_dp); > } > > /* _______________________________________________ Intel-gfx mailing list <a href="mailto:Intel-gfx@lists.freedesktop.org" class="gmail_msg" target="_blank">Intel-gfx@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/intel-gfx" rel="noreferrer" class="gmail_msg" target="_blank">https://lists.freedesktop.org/mailman/listinfo/intel-gfx</a> </blockquote></div>