Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3702ac9 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915/psr: Add activate vfunc. 



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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170907230041.22978-5-rodrigo.vivi@intel.com
parent ed63d24b

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ struct i915_psr { 


	void (*disable_source)(struct intel_dp *,

			       const struct intel_crtc_state *);

	void (*activate)(struct intel_dp *);

};



enum intel_pch {

drivers/gpu/drm/i915/intel_psr.c

+3 −6
Original line number Diff line number Diff line
@@ -472,12 +472,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;

}
@@ -987,7 +982,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;

	}

}