[Intel-gfx] [PATCH 05/12] drm/i915/psr: Add activate vfunc.

[Rodrigo Vivi]

Continue on VLV PSR split with vfunc, let's move activate
function there.

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  | 1 +
 drivers/gpu/drm/i915/intel_psr.c | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b8f14fc41dd4..ac33f0c89ec5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1147,6 +1147,7 @@ struct i915_psr {
        bool alpm;
 
        void (*disable_source)(struct intel_dp *);
+       void (*activate)(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 45c640989a46..8880d2cbe7fb 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -462,12 +462,7 @@ static void intel_psr_activate(struct intel_dp *intel_dp)
        WARN_ON(dev_priv->psr.active);
        lockdep_assert_held(&dev_priv->psr.lock);
 
-       /* Enable/Re-enable PSR on the host */
-       if (HAS_DDI(dev_priv))
-               hsw_psr_activate(intel_dp);
-       else
-               vlv_psr_activate(intel_dp);
-
+       dev_priv->psr.activate(intel_dp);
        dev_priv->psr.active = true;
 }
 
@@ -973,7 +968,9 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
 
        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                dev_priv->psr.disable_source = vlv_psr_disable;
+               dev_priv->psr.activate = vlv_psr_activate;
        } else {
                dev_priv->psr.disable_source = hsw_psr_disable;
+               dev_priv->psr.activate = hsw_psr_activate;
        }
 }
-- 
2.13.2

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