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

Commit 7ff89ca2 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c 



Let's try to shrink intel_display.c a bit by moving the cdclk/rawclk
stuff to a new file. It's all reasonably self contained so we don't
even have to add that many non-static symbols.

We'll also take the opportunity to shuffle around the functions a bit
to get things in a more consistent order based on the platform.

v2: Add kernel-docs (Ander)
v3: Deal with IS_GEN9_BC()
v4: Deal with i945gm_get_cdclk()

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207183305.19656-1-ville.syrjala@linux.intel.com
parent 4717e8bb

Documentation/gpu/i915.rst

+9 −0
Original line number Diff line number Diff line
@@ -213,6 +213,15 @@ Video BIOS Table (VBT) 
.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h

   :internal:



Display clocks

--------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

   :doc: CDCLK / RAWCLK



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

   :internal:



Display PLLs

------------

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ i915-y += intel_audio.o \ 
	  intel_atomic.o \

	  intel_atomic_plane.o \

	  intel_bios.o \

	  intel_cdclk.o \

	  intel_color.o \

	  intel_display.o \

	  intel_dpio_phy.o \

drivers/gpu/drm/i915/intel_cdclk.c

0 → 100644
+1794 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/intel_display.c

+224 −1913

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/intel_drv.h

+8 −1
Original line number Diff line number Diff line
@@ -1246,12 +1246,19 @@ void intel_audio_codec_disable(struct intel_encoder *encoder); 
void i915_audio_component_init(struct drm_i915_private *dev_priv);

void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);



/* intel_cdclk.c */

void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv);

void intel_update_max_cdclk(struct drm_i915_private *dev_priv);

void intel_update_cdclk(struct drm_i915_private *dev_priv);

void intel_update_rawclk(struct drm_i915_private *dev_priv);



/* intel_display.c */

enum transcoder intel_crtc_pch_transcoder(struct intel_crtc *crtc);

void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv, int vco);

void intel_update_rawclk(struct drm_i915_private *dev_priv);

int vlv_get_cck_clock(struct drm_i915_private *dev_priv,

		      const char *name, u32 reg, int ref_freq);

int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,

			   const char *name, u32 reg);

void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);

void lpt_disable_iclkip(struct drm_i915_private *dev_priv);

extern const struct drm_plane_funcs intel_plane_funcs;