Attachment 110134 Details for Bug 58876 – idle gmbus harder in takeover

[patch] idle gmbus harder in takeover

0001-drm-i915-idle-gmbus-in-intel_i2c_reset.patch (text/plain), 1.57 KB, created by Daniel Vetter on 2014-11-27 16:59:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-11-27 16:59:03 UTC

Size: 1.57 KB

patch

obsolete

>From c411936feb52a74ce28ead3d8dea6056f8ba8a4a Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Thu, 27 Nov 2014 17:54:25 +0100
>Subject: [PATCH] drm/i915: idle gmbus in intel_i2c_reset
>
>The bios might have left a transaction hanging in there, let's see
>what happens ...
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=58876
>Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>---
> drivers/gpu/drm/i915/intel_i2c.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
>index b31088a551f2..6cae92fea642 100644
>--- a/drivers/gpu/drm/i915/intel_i2c.c
>+++ b/drivers/gpu/drm/i915/intel_i2c.c
>@@ -58,15 +58,6 @@ to_intel_gmbus(struct i2c_adapter *i2c)
> 	return container_of(i2c, struct intel_gmbus, adapter);
> }
> 
>-void
>-intel_i2c_reset(struct drm_device *dev)
>-{
>-	struct drm_i915_private *dev_priv = dev->dev_private;
>-
>-	I915_WRITE(dev_priv->gpio_mmio_base + GMBUS0, 0);
>-	I915_WRITE(dev_priv->gpio_mmio_base + GMBUS4, 0);
>-}
>-
> static void intel_i2c_quirk_set(struct drm_i915_private *dev_priv, bool enable)
> {
> 	u32 val;
>@@ -269,6 +260,16 @@ gmbus_wait_idle(struct drm_i915_private *dev_priv)
> #undef C
> }
> 
>+void
>+intel_i2c_reset(struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	gmbus_wait_idle(dev_priv);
>+	I915_WRITE(dev_priv->gpio_mmio_base + GMBUS0, 0);
>+	I915_WRITE(dev_priv->gpio_mmio_base + GMBUS4, 0);
>+}
>+
> static int
> gmbus_xfer_read(struct drm_i915_private *dev_priv, struct i2c_msg *msg,
> 		u32 gmbus1_index)
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 58876: 72287 | 72288 | 72291 | 72294 | 82124 | 91268 | 93201 | 100724 | 100725 | 100727 | 100728 | 100731 | 100732 | 107287 | 108073 | 110134

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.