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

Commit 74c0b395 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Add port A HPD support for SPT 



On SKL the port A HPD has moved to the PCH. Hook it up.

Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3a3b3c7d

drivers/gpu/drm/i915/i915_irq.c

+19 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static const u32 hpd_cpt[HPD_NUM_PINS] = { 
};



static const u32 hpd_spt[HPD_NUM_PINS] = {

	[HPD_PORT_A] = SDE_PORTA_HOTPLUG_SPT,

	[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,

	[HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,

	[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT,
@@ -1316,6 +1317,22 @@ static bool spt_port_hotplug2_long_detect(enum port port, u32 val) 
	}

}



static bool spt_port_hotplug_long_detect(enum port port, u32 val)

{

	switch (port) {

	case PORT_A:

		return val & PORTA_HOTPLUG_LONG_DETECT;

	case PORT_B:

		return val & PORTB_HOTPLUG_LONG_DETECT;

	case PORT_C:

		return val & PORTC_HOTPLUG_LONG_DETECT;

	case PORT_D:

		return val & PORTD_HOTPLUG_LONG_DETECT;

	default:

		return false;

	}

}



static bool ilk_port_hotplug_long_detect(enum port port, u32 val)

{

	switch (port) {
@@ -1899,7 +1916,7 @@ static void spt_irq_handler(struct drm_device *dev, u32 pch_iir) 


		intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,

				   dig_hotplug_reg, hpd_spt,

				   pch_port_hotplug_long_detect);

				   spt_port_hotplug_long_detect);

	}



	if (hotplug2_trigger) {
@@ -3203,7 +3220,7 @@ static void spt_hpd_irq_setup(struct drm_device *dev) 
	/* Enable digital hotplug on the PCH */

	hotplug = I915_READ(PCH_PORT_HOTPLUG);

	hotplug |= PORTD_HOTPLUG_ENABLE | PORTC_HOTPLUG_ENABLE |

		PORTB_HOTPLUG_ENABLE;

		PORTB_HOTPLUG_ENABLE | PORTA_HOTPLUG_ENABLE;

	I915_WRITE(PCH_PORT_HOTPLUG, hotplug);



	hotplug = I915_READ(PCH_PORT_HOTPLUG2);

drivers/gpu/drm/i915/i915_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -5984,6 +5984,7 @@ enum skl_disp_power_wells { 
#define SDE_AUXB_CPT		(1 << 25)

#define SDE_AUX_MASK_CPT	(7 << 25)

#define SDE_PORTE_HOTPLUG_SPT	(1 << 25)

#define SDE_PORTA_HOTPLUG_SPT	(1 << 24)

#define SDE_PORTD_HOTPLUG_CPT	(1 << 23)

#define SDE_PORTC_HOTPLUG_CPT	(1 << 22)

#define SDE_PORTB_HOTPLUG_CPT	(1 << 21)
@@ -5997,7 +5998,8 @@ enum skl_disp_power_wells { 
#define SDE_HOTPLUG_MASK_SPT	(SDE_PORTE_HOTPLUG_SPT |	\

				 SDE_PORTD_HOTPLUG_CPT |	\

				 SDE_PORTC_HOTPLUG_CPT |	\

				 SDE_PORTB_HOTPLUG_CPT)

				 SDE_PORTB_HOTPLUG_CPT |	\

				 SDE_PORTA_HOTPLUG_SPT)

#define SDE_GMBUS_CPT		(1 << 17)

#define SDE_ERROR_CPT		(1 << 16)

#define SDE_AUDIO_CP_REQ_C_CPT	(1 << 10)