Re: [PATCH 07/14] drm/i915: Use adjusted_mode when checking conditions for PSR

Damien Lespiau
2013-09-10T16:42:24Z

On Wed, Sep 04, 2013 at 06:25:24PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> intel_edp_psr_match_conditions() currently looks at crtc->mode
> when it really needs to look at adjusted_mode. Fix it.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

--
Damien

> ---
> drivers/gpu/drm/i915/intel_dp.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index c192dbb..3f0dd65 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1570,7 +1570,8 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)
> }
>
> intel_crtc = to_intel_crtc(crtc);
> - if (!intel_crtc->active || !crtc->fb || !crtc->mode.clock) {
> + if (!intel_crtc->active || !crtc->fb ||
> + !intel_crtc->config.adjusted_mode.clock) {
> DRM_DEBUG_KMS("crtc not active for PSR\n");
> dev_priv->no_psr_reason = PSR_CRTC_NOT_ACTIVE;
> return false;
> @@ -1597,7 +1598,7 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp)
> return false;
> }
>
> - if (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE) {
> + if (intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
> DRM_DEBUG_KMS("PSR condition failed: Interlaced is Enabled\n");
> dev_priv->no_psr_reason = PSR_INTERLACED_ENABLED;
> return false;
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx