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

Commit a24c144c authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: clean up power sequencing register port select definitions 



Remove duplicates, add VLV specific macros for port B and C.

v2: also add PANEL_PORT_SELECT_DPC_VLV for clarity (Ville)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 828f5c6e

drivers/gpu/drm/i915/i915_reg.h

+2 −6
Original line number Diff line number Diff line
@@ -4449,6 +4449,8 @@ 
#define PIPEA_PP_STATUS         (VLV_DISPLAY_BASE + 0x61200)

#define PIPEA_PP_CONTROL        (VLV_DISPLAY_BASE + 0x61204)

#define PIPEA_PP_ON_DELAYS      (VLV_DISPLAY_BASE + 0x61208)

#define  PANEL_PORT_SELECT_DPB_VLV	(1 << 30)

#define  PANEL_PORT_SELECT_DPC_VLV	(2 << 30)

#define PIPEA_PP_OFF_DELAYS     (VLV_DISPLAY_BASE + 0x6120c)

#define PIPEA_PP_DIVISOR        (VLV_DISPLAY_BASE + 0x61210)
@@ -4480,7 +4482,6 @@ 
#define  PANEL_PORT_SELECT_MASK	(3 << 30)

#define  PANEL_PORT_SELECT_LVDS	(0 << 30)

#define  PANEL_PORT_SELECT_DPA	(1 << 30)

#define  EDP_PANEL		(1 << 30)

#define  PANEL_PORT_SELECT_DPC	(2 << 30)

#define  PANEL_PORT_SELECT_DPD	(3 << 30)

#define  PANEL_POWER_UP_DELAY_MASK	(0x1fff0000)
@@ -4489,11 +4490,6 @@ 
#define  PANEL_LIGHT_ON_DELAY_SHIFT	0



#define PCH_PP_OFF_DELAYS	0xc720c

#define  PANEL_POWER_PORT_SELECT_MASK	(0x3 << 30)

#define  PANEL_POWER_PORT_LVDS		(0 << 30)

#define  PANEL_POWER_PORT_DP_A		(1 << 30)

#define  PANEL_POWER_PORT_DP_C		(2 << 30)

#define  PANEL_POWER_PORT_DP_D		(3 << 30)

#define  PANEL_POWER_DOWN_DELAY_MASK	(0x1fff0000)

#define  PANEL_POWER_DOWN_DELAY_SHIFT	16

#define  PANEL_LIGHT_OFF_DELAY_MASK	(0x1fff)

drivers/gpu/drm/i915/intel_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -3288,9 +3288,9 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev, 
		port_sel = I915_READ(pp_on_reg) & 0xc0000000;

	} else if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) {

		if (dp_to_dig_port(intel_dp)->port == PORT_A)

			port_sel = PANEL_POWER_PORT_DP_A;

			port_sel = PANEL_PORT_SELECT_DPA;

		else

			port_sel = PANEL_POWER_PORT_DP_D;

			port_sel = PANEL_PORT_SELECT_DPD;

	}



	pp_on |= port_sel;