VLV/CHV has a total different PSR implementation than the
other platforms, so let's start moving that to vfuncs.
Let's start with disable_src one.

Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: Dhinakaran Pandiyan <dhinakaran.pandi...@intel.com>
Cc: Jim Bride <jim.br...@linux.intel.com>
Cc: Vathsala NAgaraju <vathsala.nagar...@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h  |  2 ++
 drivers/gpu/drm/i915/intel_psr.c | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 81cd21ecfa7d..b8f14fc41dd4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1145,6 +1145,8 @@ struct i915_psr {
        bool y_cord_support;
        bool colorimetry_support;
        bool alpm;
+
+       void (*disable_source)(struct intel_dp *);
 };
 
 enum intel_pch {
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 71d65e166277..535ea0b7ec20 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -671,11 +671,7 @@ void intel_psr_disable(struct intel_dp *intel_dp)
                return;
        }
 
-       /* Disable PSR on Source */
-       if (HAS_DDI(dev_priv))
-               hsw_psr_disable(intel_dp);
-       else
-               vlv_psr_disable(intel_dp);
+       dev_priv->psr.disable_source(intel_dp);
 
        /* Disable PSR on Sink */
        drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG, 0);
@@ -973,4 +969,10 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
 
        INIT_DELAYED_WORK(&dev_priv->psr.work, intel_psr_work);
        mutex_init(&dev_priv->psr.lock);
+
+       if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+               dev_priv->psr.disable_source = vlv_psr_disable;
+       } else {
+               dev_priv->psr.disable_source = hsw_psr_disable;
+       }
 }
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to