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

Commit c2a9fcd6 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915: Move shared dpll function prototypes to intel_dpll_mgr.h 



Move shared dpll function prototype together with other shared dpll
definitions.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457451987-17466-7-git-send-email-ander.conselvan.de.oliveira@intel.com
parent ac7f11c6

drivers/gpu/drm/i915/intel_dpll_mgr.h

+30 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define _INTEL_DPLL_MGR_H_



struct drm_i915_private;

struct intel_crtc;

struct intel_crtc_state;



enum intel_dpll_id {

	DPLL_ID_PRIVATE = -1, /* non-shared dpll in use */
@@ -102,5 +104,33 @@ struct intel_shared_dpll { 
#define SKL_DPLL2 2

#define SKL_DPLL3 3



/* shared dpll functions */

struct intel_shared_dpll *

intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,

			    enum intel_dpll_id id);

enum intel_dpll_id

intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,

			 struct intel_shared_dpll *pll);

void

intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,

			     struct intel_shared_dpll *pll,

			     struct intel_crtc *crtc);

void

intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,

			     struct intel_shared_dpll *pll,

			     struct intel_crtc *crtc);

void assert_shared_dpll(struct drm_i915_private *dev_priv,

			struct intel_shared_dpll *pll,

			bool state);

#define assert_shared_dpll_enabled(d, p) assert_shared_dpll(d, p, true)

#define assert_shared_dpll_disabled(d, p) assert_shared_dpll(d, p, false)

struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,

						struct intel_crtc_state *state);

void intel_prepare_shared_dpll(struct intel_crtc *crtc);

void intel_enable_shared_dpll(struct intel_crtc *crtc);

void intel_disable_shared_dpll(struct intel_crtc *crtc);

void intel_shared_dpll_commit(struct drm_atomic_state *state);

void intel_shared_dpll_init(struct drm_device *dev);





#endif /* _INTEL_DPLL_MGR_H_ */

drivers/gpu/drm/i915/intel_drv.h

+0 −28
Original line number Diff line number Diff line
@@ -1203,34 +1203,6 @@ void intel_create_rotation_property(struct drm_device *dev, 
void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,

				    enum pipe pipe);



/* shared dpll functions */

struct intel_shared_dpll *

intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,

			    enum intel_dpll_id id);

enum intel_dpll_id

intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,

			 struct intel_shared_dpll *pll);

void

intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,

			     struct intel_shared_dpll *pll,

			     struct intel_crtc *crtc);

void

intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,

			     struct intel_shared_dpll *pll,

			     struct intel_crtc *crtc);

void assert_shared_dpll(struct drm_i915_private *dev_priv,

			struct intel_shared_dpll *pll,

			bool state);

#define assert_shared_dpll_enabled(d, p) assert_shared_dpll(d, p, true)

#define assert_shared_dpll_disabled(d, p) assert_shared_dpll(d, p, false)

struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,

						struct intel_crtc_state *state);

void intel_prepare_shared_dpll(struct intel_crtc *crtc);

void intel_enable_shared_dpll(struct intel_crtc *crtc);

void intel_disable_shared_dpll(struct intel_crtc *crtc);

void intel_shared_dpll_commit(struct drm_atomic_state *state);

void intel_shared_dpll_init(struct drm_device *dev);



int vlv_force_pll_on(struct drm_device *dev, enum pipe pipe,

		     const struct dpll *dpll);

void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe);