WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_i2c.c

 #include
 #include "i915_drv.h"
 struct gmbus_pin {
 	const char *name;
-	int reg;
+	i915_reg_t reg;
 };
 /* Map gmbus pin pairs to names and registers. */
 	[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_1_BXT] = { "dpb", GPIOB },
-	[GMBUS_PIN_2_BXT] = { "dpc", PCH_GPIOC },
+	[GMBUS_PIN_2_BXT] = { "dpc", GPIOC },
-	[GMBUS_PIN_3_BXT] = { "misc", PCH_GPIOD },
+	[GMBUS_PIN_3_BXT] = { "misc", GPIOD },
 };
 /* pin is expected to be valid */
 static const struct gmbus_pin *get_gmbus_pin(struct drm_i915_private *dev_priv,
 					     unsigned int pin)
+{
 	if (IS_BROXTON(dev_priv))
 		return &gmbus_pins_bxt[pin];
-	else if (IS_SKYLAKE(dev_priv))
+	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
 		return &gmbus_pins_skl[pin];
 	else if (IS_BROADWELL(dev_priv))
 		return &gmbus_pins_bdw[pin];
+{
 	unsigned int size;
 	if (IS_BROXTON(dev_priv))
 		size = ARRAY_SIZE(gmbus_pins_bxt);
-	else if (IS_SKYLAKE(dev_priv))
+	else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
 		size = ARRAY_SIZE(gmbus_pins_skl);
 	else if (IS_BROADWELL(dev_priv))
 		size = ARRAY_SIZE(gmbus_pins_bdw);
 	else
+		size = ARRAY_SIZE(gmbus_pins);
-		size = ARRAY_SIZE(gmbus_pins);
 	return pin < size &&
-	return pin < size && get_gmbus_pin(dev_priv, pin)->reg;
+		i915_mmio_reg_valid(get_gmbus_pin(dev_priv, pin)->reg);
+}
 	struct drm_i915_private *dev_priv = bus->dev_priv;
 	struct i2c_algo_bit_data *algo;
 	algo = &bus->bit_algo;
-	bus->gpio_reg = dev_priv->gpio_mmio_base +
-		get_gmbus_pin(dev_priv, pin)->reg;
+	bus->gpio_reg = _MMIO(dev_priv->gpio_mmio_base +
 			      i915_mmio_reg_offset(get_gmbus_pin(dev_priv, pin)->reg));
 	bus->adapter.algo_data = algo;
 	algo->setsda = set_data;
 	algo->setscl = set_clock;
 	return ret;
+}
-static int
-gmbus_xfer(struct i2c_adapter *adapter,
-	   struct i2c_msg *msgs,
+static int
-	   int num)
+do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
+{
 	struct intel_gmbus *bus = container_of(adapter,
 					       struct intel_gmbus,
 					       adapter);
 	struct drm_i915_private *dev_priv = bus->dev_priv;
-	int i = 0, inc, try = 0;
-	int ret = 0;
-	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
-	mutex_lock(&dev_priv->gmbus_mutex);
-	if (bus->force_bit) {
-		ret = i2c_bit_algo.master_xfer(adapter, msgs, num);
-		goto out;
+	int i = 0, inc, try = 0;
 	int ret = 0;
 retry:
 			ret = gmbus_xfer_read(dev_priv, &msgs[i], 0);
 		} else {
 			ret = gmbus_xfer_write(dev_priv, &msgs[i]);
+		}
-		if (ret == -ETIMEDOUT)
-			goto timeout;
-		if (ret == -ENXIO)
-			goto clear_err;
 		if (!ret)
-		ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE,
+			ret = gmbus_wait_hw_status(dev_priv, GMBUS_HW_WAIT_PHASE,
-					   GMBUS_HW_WAIT_EN);
+						   GMBUS_HW_WAIT_EN);
-		if (ret == -ENXIO)
-			goto clear_err;
-		if (ret)
+		if (ret == -ETIMEDOUT)
+			goto timeout;
+		else if (ret)
-			goto timeout;
+			goto clear_err;
+	}
 	/* Generate a STOP condition on the bus. Note that gmbus can't generata
 timeout:
 	DRM_INFO("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
 		 bus->adapter.name, bus->reg0 & 0xff);
 	I915_WRITE(GMBUS0, 0);
+	/*
+	 * Hardware may not support GMBUS over these pins? Try GPIO bitbanging
+	 * instead. Use EAGAIN to have i2c core retry.
-	/* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */
+	 */
 	bus->force_bit = 1;
-	ret = i2c_bit_algo.master_xfer(adapter, msgs, num);
+	ret = -EAGAIN;
+out:
+	return ret;
+}
+static int
+gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
+{
+	struct intel_gmbus *bus = container_of(adapter, struct intel_gmbus,
+					       adapter);
+	struct drm_i915_private *dev_priv = bus->dev_priv;
+	int ret;
+	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
+	mutex_lock(&dev_priv->gmbus_mutex);
+	if (bus->force_bit)
+	ret = i2c_bit_algo.master_xfer(adapter, msgs, num);
+	else
-out:
+		ret = do_gmbus_xfer(adapter, msgs, num);
 	mutex_unlock(&dev_priv->gmbus_mutex);
 	mutex_unlock(&dev_priv->gmbus_mutex);
 	unsigned int pin;
 	int ret;
 	if (HAS_PCH_NOP(dev))
-		return 0;
-	else if (HAS_PCH_SPLIT(dev))
+		return 0;
-		dev_priv->gpio_mmio_base = PCH_GPIOA - GPIOA;
-	else if (IS_VALLEYVIEW(dev))
+	if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))
 		dev_priv->gpio_mmio_base = VLV_DISPLAY_BASE;
-	else
+	else if (!HAS_GMCH_DISPLAY(dev_priv))
+		dev_priv->gpio_mmio_base =
+			i915_mmio_reg_offset(PCH_GPIOA) -
-		dev_priv->gpio_mmio_base = 0;
+			i915_mmio_reg_offset(GPIOA);
 	mutex_init(&dev_priv->gmbus_mutex);
 		bus->adapter.dev.parent = &dev->pdev->dev;
 		bus->dev_priv = dev_priv;
+		bus->adapter.algo = &gmbus_algorithm;
+		/*
+		 * We wish to retry with bit banging
+		 * after a timed out GMBUS attempt.
+		 */
-		bus->adapter.algo = &gmbus_algorithm;
+		bus->adapter.retries = 1;
 		/* By default use a conservative clock rate */
 		bus->reg0 = pin | GMBUS_RATE_100KHZ;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_i2c.c – Rev 6320 → 6937