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

Commit 9787e835 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915/cnl: Enable DDI-F on Cannonlake. 



Now let's finish the Port-F support by adding the
proper port F detection, irq and power well support.

v2: Rebase
v3: Use BIT_ULL
v4: Cover missed case on ddi init.
v5: Update commit message.
v6: Rebase on top of display headers rework.
v7: Squash power-well handling related to DDI F to this
    patch to avoid warns as pointed out by DK.
v8: Introduce DDI_F_LANES to PG2. (DK)
v9: Squash in the PORT_F case for enabling DP MST encoder. (DK)

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180129232223.766-9-rodrigo.vivi@intel.com
parent cf53902f

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,7 @@ enum i915_power_well_id { 
	SKL_DISP_PW_DDI_B,

	SKL_DISP_PW_DDI_C,

	SKL_DISP_PW_DDI_D,

	CNL_DISP_PW_DDI_F = 6,



	GLK_DISP_PW_AUX_A = 8,

	GLK_DISP_PW_AUX_B,
@@ -8860,6 +8861,7 @@ enum skl_power_gate { 
#define  SFUSE_STRAP_RAW_FREQUENCY	(1<<8)

#define  SFUSE_STRAP_DISPLAY_DISABLED	(1<<7)

#define  SFUSE_STRAP_CRT_DISABLED	(1<<6)

#define  SFUSE_STRAP_DDIF_DETECTED	(1<<3)

#define  SFUSE_STRAP_DDIB_DETECTED	(1<<2)

#define  SFUSE_STRAP_DDIC_DETECTED	(1<<1)

#define  SFUSE_STRAP_DDID_DETECTED	(1<<0)

drivers/gpu/drm/i915/intel_ddi.c

+4 −0
Original line number Diff line number Diff line
@@ -2910,6 +2910,10 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 
		intel_dig_port->ddi_io_power_domain =

			POWER_DOMAIN_PORT_DDI_E_IO;

		break;

	case PORT_F:

		intel_dig_port->ddi_io_power_domain =

			POWER_DOMAIN_PORT_DDI_F_IO;

		break;

	default:

		MISSING_CASE(port);

	}

drivers/gpu/drm/i915/intel_display.c

+5 −1
Original line number Diff line number Diff line
@@ -5671,6 +5671,8 @@ enum intel_display_power_domain intel_port_to_power_domain(enum port port) 
		return POWER_DOMAIN_PORT_DDI_D_LANES;

	case PORT_E:

		return POWER_DOMAIN_PORT_DDI_E_LANES;

	case PORT_F:

		return POWER_DOMAIN_PORT_DDI_F_LANES;

	default:

		MISSING_CASE(port);

		return POWER_DOMAIN_PORT_OTHER;
@@ -13624,7 +13626,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		if (found || IS_GEN9_BC(dev_priv))

			intel_ddi_init(dev_priv, PORT_A);



		/* DDI B, C and D detection is indicated by the SFUSE_STRAP

		/* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP

		 * register */

		found = I915_READ(SFUSE_STRAP);
@@ -13634,6 +13636,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
			intel_ddi_init(dev_priv, PORT_C);

		if (found & SFUSE_STRAP_DDID_DETECTED)

			intel_ddi_init(dev_priv, PORT_D);

		if (found & SFUSE_STRAP_DDIF_DETECTED)

			intel_ddi_init(dev_priv, PORT_F);

		/*

		 * On SKL we don't have a way to detect DDI-E so we rely on VBT.

		 */

drivers/gpu/drm/i915/intel_display.h

+2 −0
Original line number Diff line number Diff line
@@ -157,11 +157,13 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_PORT_DDI_C_LANES,

	POWER_DOMAIN_PORT_DDI_D_LANES,

	POWER_DOMAIN_PORT_DDI_E_LANES,

	POWER_DOMAIN_PORT_DDI_F_LANES,

	POWER_DOMAIN_PORT_DDI_A_IO,

	POWER_DOMAIN_PORT_DDI_B_IO,

	POWER_DOMAIN_PORT_DDI_C_IO,

	POWER_DOMAIN_PORT_DDI_D_IO,

	POWER_DOMAIN_PORT_DDI_E_IO,

	POWER_DOMAIN_PORT_DDI_F_IO,

	POWER_DOMAIN_PORT_DSI,

	POWER_DOMAIN_PORT_CRT,

	POWER_DOMAIN_PORT_OTHER,

drivers/gpu/drm/i915/intel_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -6132,7 +6132,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 


	/* init MST on ports that can support it */

	if (HAS_DP_MST(dev_priv) && !intel_dp_is_edp(intel_dp) &&

	    (port == PORT_B || port == PORT_C || port == PORT_D))

	    (port == PORT_B || port == PORT_C ||

	     port == PORT_D || port == PORT_F))

		intel_dp_mst_encoder_init(intel_dig_port,

					  intel_connector->base.base.id);