From e3702ac9a2c128690b2219eb1282367584a3b7bb Mon Sep 17 00:00:00 2001
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Thu, 7 Sep 2017 16:00:34 -0700
Subject: [PATCH] drm/i915/psr: Add activate vfunc.
Git-commit: e3702ac9a2c128690b2219eb1282367584a3b7bb
Patch-mainline: v4.15-rc1
References: FATE#322643 bsc#1055900
Continue on VLV PSR split with vfunc, let's move activate
function there.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170907230041.22978-5-rodrigo.vivi@intel.com
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_psr.c | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1182,6 +1182,7 @@ struct i915_psr {
void (*disable_source)(struct intel_dp *,
const struct intel_crtc_state *);
+ void (*activate)(struct intel_dp *);
};
enum intel_pch {
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -472,12 +472,7 @@ static void intel_psr_activate(struct in
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;
}
@@ -987,7 +982,9 @@ void intel_psr_init(struct drm_i915_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;
}
}