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

drm/i915: don't register invalid gmbus pins for skl 



Do not expose invalid gmbus pins as i2c devices to userspace.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c1bad5b6

drivers/gpu/drm/i915/intel_i2c.c

+10 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ static const struct gmbus_pin gmbus_pins_bdw[] = { 
	[GMBUS_PIN_DPD] = { "dpd", GPIOF },

};



static const struct gmbus_pin gmbus_pins_skl[] = {

	[GMBUS_PIN_DPC] = { "dpc", GPIOD },

	[GMBUS_PIN_DPB] = { "dpb", GPIOE },

	[GMBUS_PIN_DPD] = { "dpd", GPIOF },

};



static const struct gmbus_pin gmbus_pins_bxt[] = {

	[GMBUS_PIN_1_BXT] = { "dpb", PCH_GPIOB },

	[GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
@@ -68,6 +74,8 @@ static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv, 
{

	if (IS_BROXTON(dev_priv))

		return &gmbus_pins_bxt[pin];

	else if (IS_SKYLAKE(dev_priv))

		return &gmbus_pins_skl[pin];

	else if (IS_BROADWELL(dev_priv))

		return &gmbus_pins_bdw[pin];

	else
@@ -81,6 +89,8 @@ bool intel_gmbus_is_valid_pin(struct drm_i915_private *dev_priv, 


	if (IS_BROXTON(dev_priv))

		size = ARRAY_SIZE(gmbus_pins_bxt);

	else if (IS_SKYLAKE(dev_priv))

		size = ARRAY_SIZE(gmbus_pins_skl);

	else if (IS_BROADWELL(dev_priv))

		size = ARRAY_SIZE(gmbus_pins_bdw);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE