Commit 5b76e860 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/tc_port/hpd_pin/ in GEN11_{TC,TBT}_HOTPLUG() 



Use hpd_pin instead of tc_port in the GEN11_{TC,TBT}_HOTPLUG()
to make it clear what they refer to.

Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028213323.5423-11-ville.syrjala@linux.intel.com
parent 5f371a81

drivers/gpu/drm/i915/i915_irq.c

+24 −24
Original line number Diff line number Diff line
@@ -132,12 +132,12 @@ static const u32 hpd_bxt[HPD_NUM_PINS] = { 
};



static const u32 hpd_gen11[HPD_NUM_PINS] = {

	[HPD_PORT_TC1] = GEN11_TC_HOTPLUG(TC_PORT_1) | GEN11_TBT_HOTPLUG(TC_PORT_1),

	[HPD_PORT_TC2] = GEN11_TC_HOTPLUG(TC_PORT_2) | GEN11_TBT_HOTPLUG(TC_PORT_2),

	[HPD_PORT_TC3] = GEN11_TC_HOTPLUG(TC_PORT_3) | GEN11_TBT_HOTPLUG(TC_PORT_3),

	[HPD_PORT_TC4] = GEN11_TC_HOTPLUG(TC_PORT_4) | GEN11_TBT_HOTPLUG(TC_PORT_4),

	[HPD_PORT_TC5] = GEN11_TC_HOTPLUG(TC_PORT_5) | GEN11_TBT_HOTPLUG(TC_PORT_5),

	[HPD_PORT_TC6] = GEN11_TC_HOTPLUG(TC_PORT_6) | GEN11_TBT_HOTPLUG(TC_PORT_6),

	[HPD_PORT_TC1] = GEN11_TC_HOTPLUG(HPD_PORT_TC1) | GEN11_TBT_HOTPLUG(HPD_PORT_TC1),

	[HPD_PORT_TC2] = GEN11_TC_HOTPLUG(HPD_PORT_TC2) | GEN11_TBT_HOTPLUG(HPD_PORT_TC2),

	[HPD_PORT_TC3] = GEN11_TC_HOTPLUG(HPD_PORT_TC3) | GEN11_TBT_HOTPLUG(HPD_PORT_TC3),

	[HPD_PORT_TC4] = GEN11_TC_HOTPLUG(HPD_PORT_TC4) | GEN11_TBT_HOTPLUG(HPD_PORT_TC4),

	[HPD_PORT_TC5] = GEN11_TC_HOTPLUG(HPD_PORT_TC5) | GEN11_TBT_HOTPLUG(HPD_PORT_TC5),

	[HPD_PORT_TC6] = GEN11_TC_HOTPLUG(HPD_PORT_TC6) | GEN11_TBT_HOTPLUG(HPD_PORT_TC6),

};



static const u32 hpd_icp[HPD_NUM_PINS] = {
@@ -1042,17 +1042,17 @@ static bool gen11_port_hotplug_long_detect(enum hpd_pin pin, u32 val) 
{

	switch (pin) {

	case HPD_PORT_TC1:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_1);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC1);

	case HPD_PORT_TC2:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_2);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC2);

	case HPD_PORT_TC3:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_3);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC3);

	case HPD_PORT_TC4:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_4);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC4);

	case HPD_PORT_TC5:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_5);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC5);

	case HPD_PORT_TC6:

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(TC_PORT_6);

		return val & GEN11_HOTPLUG_CTL_LONG_DETECT(HPD_PORT_TC6);

	default:

		return false;

	}
@@ -3286,21 +3286,21 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) 
	u32 hotplug;



	hotplug = I915_READ(GEN11_TC_HOTPLUG_CTL);

	hotplug |= GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_1) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_2) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_3) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_4) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_5) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_6);

	hotplug |= GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6);

	I915_WRITE(GEN11_TC_HOTPLUG_CTL, hotplug);



	hotplug = I915_READ(GEN11_TBT_HOTPLUG_CTL);

	hotplug |= GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_1) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_2) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_3) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_4) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_5) |

		   GEN11_HOTPLUG_CTL_ENABLE(TC_PORT_6);

	hotplug |= GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC1) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC2) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC3) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC4) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC5) |

		   GEN11_HOTPLUG_CTL_ENABLE(HPD_PORT_TC6);

	I915_WRITE(GEN11_TBT_HOTPLUG_CTL, hotplug);

}

drivers/gpu/drm/i915/i915_reg.h

+19 −18
Original line number Diff line number Diff line
@@ -7814,6 +7814,7 @@ enum { 
	 GEN11_PIPE_PLANE5_FAULT)



#define _HPD_PIN_DDI(hpd_pin)	((hpd_pin) - HPD_PORT_A)

#define _HPD_PIN_TC(hpd_pin)	((hpd_pin) - HPD_PORT_TC1)



#define GEN8_DE_PORT_ISR _MMIO(0x44440)

#define GEN8_DE_PORT_IMR _MMIO(0x44444)
@@ -7891,27 +7892,27 @@ enum { 
#define GEN11_DE_HPD_IMR		_MMIO(0x44474)

#define GEN11_DE_HPD_IIR		_MMIO(0x44478)

#define GEN11_DE_HPD_IER		_MMIO(0x4447c)

#define  GEN11_TC_HOTPLUG(tc_port)		(1 << ((tc_port) + 16))

#define  GEN11_DE_TC_HOTPLUG_MASK		(GEN11_TC_HOTPLUG(TC_PORT_6) | \

						 GEN11_TC_HOTPLUG(TC_PORT_5) | \

						 GEN11_TC_HOTPLUG(TC_PORT_4) | \

						 GEN11_TC_HOTPLUG(TC_PORT_3) | \

						 GEN11_TC_HOTPLUG(TC_PORT_2) | \

						 GEN11_TC_HOTPLUG(TC_PORT_1))

#define  GEN11_TBT_HOTPLUG(tc_port)		(1 << (tc_port))

#define  GEN11_DE_TBT_HOTPLUG_MASK		(GEN11_TBT_HOTPLUG(TC_PORT_6) | \

						 GEN11_TBT_HOTPLUG(TC_PORT_5) | \

						 GEN11_TBT_HOTPLUG(TC_PORT_4) | \

						 GEN11_TBT_HOTPLUG(TC_PORT_3) | \

						 GEN11_TBT_HOTPLUG(TC_PORT_2) | \

						 GEN11_TBT_HOTPLUG(TC_PORT_1))

#define  GEN11_TC_HOTPLUG(hpd_pin)		REG_BIT(16 + _HPD_PIN_TC(hpd_pin))

#define  GEN11_DE_TC_HOTPLUG_MASK		(GEN11_TC_HOTPLUG(HPD_PORT_TC6) | \

						 GEN11_TC_HOTPLUG(HPD_PORT_TC5) | \

						 GEN11_TC_HOTPLUG(HPD_PORT_TC4) | \

						 GEN11_TC_HOTPLUG(HPD_PORT_TC3) | \

						 GEN11_TC_HOTPLUG(HPD_PORT_TC2) | \

						 GEN11_TC_HOTPLUG(HPD_PORT_TC1))

#define  GEN11_TBT_HOTPLUG(hpd_pin)		REG_BIT(_HPD_PIN_TC(hpd_pin))

#define  GEN11_DE_TBT_HOTPLUG_MASK		(GEN11_TBT_HOTPLUG(HPD_PORT_TC6) | \

						 GEN11_TBT_HOTPLUG(HPD_PORT_TC5) | \

						 GEN11_TBT_HOTPLUG(HPD_PORT_TC4) | \

						 GEN11_TBT_HOTPLUG(HPD_PORT_TC3) | \

						 GEN11_TBT_HOTPLUG(HPD_PORT_TC2) | \

						 GEN11_TBT_HOTPLUG(HPD_PORT_TC1))



#define GEN11_TBT_HOTPLUG_CTL				_MMIO(0x44030)

#define GEN11_TC_HOTPLUG_CTL				_MMIO(0x44038)

#define  GEN11_HOTPLUG_CTL_ENABLE(tc_port)		(8 << (tc_port) * 4)

#define  GEN11_HOTPLUG_CTL_LONG_DETECT(tc_port)		(2 << (tc_port) * 4)

#define  GEN11_HOTPLUG_CTL_SHORT_DETECT(tc_port)	(1 << (tc_port) * 4)

#define  GEN11_HOTPLUG_CTL_NO_DETECT(tc_port)		(0 << (tc_port) * 4)

#define  GEN11_HOTPLUG_CTL_ENABLE(hpd_pin)		(8 << (_HPD_PIN_TC(hpd_pin) * 4))

#define  GEN11_HOTPLUG_CTL_LONG_DETECT(hpd_pin)		(2 << (_HPD_PIN_TC(hpd_pin) * 4))

#define  GEN11_HOTPLUG_CTL_SHORT_DETECT(hpd_pin)	(1 << (_HPD_PIN_TC(hpd_pin) * 4))

#define  GEN11_HOTPLUG_CTL_NO_DETECT(hpd_pin)		(0 << (_HPD_PIN_TC(hpd_pin) * 4))



#define GEN11_GT_INTR_DW0		_MMIO(0x190018)

#define  GEN11_CSME			(31)

CRA Git | Maintained and supported by SUSTech CRA and CCSE