Commit 80e77e30 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dpll: move dpll modeset asserts to intel_dpll.c 



Keep the functionality and the assert code together.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0229659fb8af6c91c774408c6f7bb8c4ff8735e3.1632992608.git.jani.nikula@intel.com
parent aa0813b1

drivers/gpu/drm/i915/display/intel_color.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "intel_color.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_dpll.h"



#define CTM_COEFF_SIGN	(1ULL << 63)

drivers/gpu/drm/i915/display/intel_display.c

+0 −14
Original line number Diff line number Diff line
@@ -398,20 +398,6 @@ intel_wait_for_pipe_off(const struct intel_crtc_state *old_crtc_state) 
	}

}



/* Only for pre-ILK configs */

void assert_pll(struct drm_i915_private *dev_priv,

		enum pipe pipe, bool state)

{

	u32 val;

	bool cur_state;



	val = intel_de_read(dev_priv, DPLL(pipe));

	cur_state = !!(val & DPLL_VCO_ENABLE);

	I915_STATE_WARN(cur_state != state,

	     "PLL state assertion failure (expected %s, current %s)\n",

			onoff(state), onoff(cur_state));

}



/* XXX: the dsi pll is shared between MIPI DSI ports */

void assert_dsi_pll(struct drm_i915_private *dev_priv, bool state)

{

drivers/gpu/drm/i915/display/intel_display.h

+0 −4
Original line number Diff line number Diff line
@@ -645,10 +645,6 @@ void intel_init_pch_refclk(struct drm_i915_private *dev_priv); 
int intel_modeset_all_pipes(struct intel_atomic_state *state);



/* modesetting asserts */

void assert_pll(struct drm_i915_private *dev_priv,

		enum pipe pipe, bool state);

#define assert_pll_enabled(d, p) assert_pll(d, p, true)

#define assert_pll_disabled(d, p) assert_pll(d, p, false)

void assert_dsi_pll(struct drm_i915_private *dev_priv, bool state);

#define assert_dsi_pll_enabled(d) assert_dsi_pll(d, true)

#define assert_dsi_pll_disabled(d) assert_dsi_pll(d, false)

drivers/gpu/drm/i915/display/intel_display_power.c

+2 −1
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ 
#include "i915_irq.h"

#include "intel_cdclk.h"

#include "intel_combo_phy.h"

#include "intel_display_power.h"

#include "intel_de.h"

#include "intel_display_power.h"

#include "intel_display_types.h"

#include "intel_dmc.h"

#include "intel_dpio_phy.h"

#include "intel_dpll.h"

#include "intel_hotplug.h"

#include "intel_pm.h"

#include "intel_pps.h"

drivers/gpu/drm/i915/display/intel_dpll.c

+22 −0
Original line number Diff line number Diff line
@@ -1923,3 +1923,25 @@ void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe) 
	else

		vlv_disable_pll(dev_priv, pipe);

}



/* Only for pre-ILK configs */

static void assert_pll(struct drm_i915_private *dev_priv,

		       enum pipe pipe, bool state)

{

	bool cur_state;



	cur_state = intel_de_read(dev_priv, DPLL(pipe)) & DPLL_VCO_ENABLE;

	I915_STATE_WARN(cur_state != state,

			"PLL state assertion failure (expected %s, current %s)\n",

			onoff(state), onoff(cur_state));

}



void assert_pll_enabled(struct drm_i915_private *i915, enum pipe pipe)

{

	assert_pll(i915, pipe, true);

}



void assert_pll_disabled(struct drm_i915_private *i915, enum pipe pipe)

{

	assert_pll(i915, pipe, false);

}