Commit 6cc235f7 authored by Suraj Kandpal's avatar Suraj Kandpal
Browse files

drm/i915/dpll: Rename intel_shared_dpll_funcs 



Rename intel_shared_dpll_funcs to intel_dpll_funcs
since it needs to represent both shared and individual
dplls.

--v2
-Change intel_global_dpll to intel_dpll_global to be more
in line with the naming standard where the name should
start with the file name [Jani]

--v3
-Drop shared and global altogether [Jani]

--v4
-Keep declarations sorted [Jani]

Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250515071801.2221120-6-suraj.kandpal@intel.com
parent 958a3320

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

+12 −12
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
 */



/* platform specific hooks for managing DPLLs */

struct intel_shared_dpll_funcs {

struct intel_dpll_funcs {

	/*

	 * Hook for enabling the pll, called from intel_enable_shared_dpll() if

	 * the pll is not already enabled.
@@ -670,7 +670,7 @@ static bool ibx_compare_hw_state(const struct intel_dpll_hw_state *_a, 
		a->fp1 == b->fp1;

}



static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = {

static const struct intel_dpll_funcs ibx_pch_dpll_funcs = {

	.enable = ibx_pch_dpll_enable,

	.disable = ibx_pch_dpll_disable,

	.get_hw_state = ibx_pch_dpll_get_hw_state,
@@ -1270,14 +1270,14 @@ static bool hsw_compare_hw_state(const struct intel_dpll_hw_state *_a, 
		a->spll == b->spll;

}



static const struct intel_shared_dpll_funcs hsw_ddi_wrpll_funcs = {

static const struct intel_dpll_funcs hsw_ddi_wrpll_funcs = {

	.enable = hsw_ddi_wrpll_enable,

	.disable = hsw_ddi_wrpll_disable,

	.get_hw_state = hsw_ddi_wrpll_get_hw_state,

	.get_freq = hsw_ddi_wrpll_get_freq,

};



static const struct intel_shared_dpll_funcs hsw_ddi_spll_funcs = {

static const struct intel_dpll_funcs hsw_ddi_spll_funcs = {

	.enable = hsw_ddi_spll_enable,

	.disable = hsw_ddi_spll_disable,

	.get_hw_state = hsw_ddi_spll_get_hw_state,
@@ -1302,7 +1302,7 @@ static bool hsw_ddi_lcpll_get_hw_state(struct intel_display *display, 
	return true;

}



static const struct intel_shared_dpll_funcs hsw_ddi_lcpll_funcs = {

static const struct intel_dpll_funcs hsw_ddi_lcpll_funcs = {

	.enable = hsw_ddi_lcpll_enable,

	.disable = hsw_ddi_lcpll_disable,

	.get_hw_state = hsw_ddi_lcpll_get_hw_state,
@@ -2004,14 +2004,14 @@ static bool skl_compare_hw_state(const struct intel_dpll_hw_state *_a, 
		a->cfgcr2 == b->cfgcr2;

}



static const struct intel_shared_dpll_funcs skl_ddi_pll_funcs = {

static const struct intel_dpll_funcs skl_ddi_pll_funcs = {

	.enable = skl_ddi_pll_enable,

	.disable = skl_ddi_pll_disable,

	.get_hw_state = skl_ddi_pll_get_hw_state,

	.get_freq = skl_ddi_pll_get_freq,

};



static const struct intel_shared_dpll_funcs skl_ddi_dpll0_funcs = {

static const struct intel_dpll_funcs skl_ddi_dpll0_funcs = {

	.enable = skl_ddi_dpll0_enable,

	.disable = skl_ddi_dpll0_disable,

	.get_hw_state = skl_ddi_dpll0_get_hw_state,
@@ -2486,7 +2486,7 @@ static bool bxt_compare_hw_state(const struct intel_dpll_hw_state *_a, 
		a->pcsdw12 == b->pcsdw12;

}



static const struct intel_shared_dpll_funcs bxt_ddi_pll_funcs = {

static const struct intel_dpll_funcs bxt_ddi_pll_funcs = {

	.enable = bxt_ddi_pll_enable,

	.disable = bxt_ddi_pll_disable,

	.get_hw_state = bxt_ddi_pll_get_hw_state,
@@ -4129,21 +4129,21 @@ static bool icl_compare_hw_state(const struct intel_dpll_hw_state *_a, 
		a->mg_pll_tdc_coldst_bias == b->mg_pll_tdc_coldst_bias;

}



static const struct intel_shared_dpll_funcs combo_pll_funcs = {

static const struct intel_dpll_funcs combo_pll_funcs = {

	.enable = combo_pll_enable,

	.disable = combo_pll_disable,

	.get_hw_state = combo_pll_get_hw_state,

	.get_freq = icl_ddi_combo_pll_get_freq,

};



static const struct intel_shared_dpll_funcs tbt_pll_funcs = {

static const struct intel_dpll_funcs tbt_pll_funcs = {

	.enable = tbt_pll_enable,

	.disable = tbt_pll_disable,

	.get_hw_state = tbt_pll_get_hw_state,

	.get_freq = icl_ddi_tbt_pll_get_freq,

};



static const struct intel_shared_dpll_funcs mg_pll_funcs = {

static const struct intel_dpll_funcs mg_pll_funcs = {

	.enable = mg_pll_enable,

	.disable = mg_pll_disable,

	.get_hw_state = mg_pll_get_hw_state,
@@ -4191,7 +4191,7 @@ static const struct intel_dpll_mgr ehl_pll_mgr = { 
	.compare_hw_state = icl_compare_hw_state,

};



static const struct intel_shared_dpll_funcs dkl_pll_funcs = {

static const struct intel_dpll_funcs dkl_pll_funcs = {

	.enable = mg_pll_enable,

	.disable = mg_pll_disable,

	.get_hw_state = dkl_pll_get_hw_state,

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

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ struct drm_printer; 
struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_dpll_funcs;

struct intel_encoder;

struct intel_shared_dpll;

struct intel_shared_dpll_funcs;



/**

 * enum intel_dpll_id - possible DPLL ids
@@ -314,7 +314,7 @@ struct dpll_info { 
	/**

	 * @funcs: platform specific hooks

	 */

	const struct intel_shared_dpll_funcs *funcs;

	const struct intel_dpll_funcs *funcs;



	/**

	 * @id: unique identifier for this DPLL