Commit ca09800f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/power: relocate {SKL,ICL}_PW_CTL_IDX_TO_PG() 



Move the {SKL,ICL}_PW_CTL_IDX_TO_PG() macros from intel_display_regs.h
to intel_display_power_well.c. The mapping from index to PG can be
hidden there.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/18e40b77eeb3517a056f1e567672163ec568ec55.1750855148.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c7cefe47

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

+13 −0
Original line number Diff line number Diff line
@@ -34,6 +34,19 @@ 
#include "vlv_iosf_sb_reg.h"

#include "vlv_sideband.h"



/*

 * PG0 is HW controlled, so doesn't have a corresponding power well control knob

 * SKL_DISP_PW1_IDX..SKL_DISP_PW2_IDX -> PG1..PG2

 */

#define  SKL_PW_CTL_IDX_TO_PG(pw_idx)		\

	((pw_idx) - SKL_PW_CTL_IDX_PW_1 + SKL_PG1)

/*

 * PG0 is HW controlled, so doesn't have a corresponding power well control knob

 * ICL_DISP_PW1_IDX..ICL_DISP_PW4_IDX -> PG1..PG4

 */

#define  ICL_PW_CTL_IDX_TO_PG(pw_idx)		\

	((pw_idx) - ICL_PW_CTL_IDX_PW_1 + SKL_PG1)



struct i915_power_well_regs {

	i915_reg_t bios;

	i915_reg_t driver;

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

+0 −12
Original line number Diff line number Diff line
@@ -2206,18 +2206,6 @@ enum skl_power_gate { 


#define SKL_FUSE_STATUS				_MMIO(0x42000)

#define  SKL_FUSE_DOWNLOAD_STATUS		(1 << 31)

/*

 * PG0 is HW controlled, so doesn't have a corresponding power well control knob

 * SKL_DISP_PW1_IDX..SKL_DISP_PW2_IDX -> PG1..PG2

 */

#define  SKL_PW_CTL_IDX_TO_PG(pw_idx)		\

	((pw_idx) - SKL_PW_CTL_IDX_PW_1 + SKL_PG1)

/*

 * PG0 is HW controlled, so doesn't have a corresponding power well control knob

 * ICL_DISP_PW1_IDX..ICL_DISP_PW4_IDX -> PG1..PG4

 */

#define  ICL_PW_CTL_IDX_TO_PG(pw_idx)		\

	((pw_idx) - ICL_PW_CTL_IDX_PW_1 + SKL_PG1)

#define  SKL_FUSE_PG_DIST_STATUS(pg)		(1 << (27 - (pg)))



/* Per-pipe DDI Function Control */