From patchwork Thu Mar 31 15:20:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 679741 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2VFL1cD028410 for ; Thu, 31 Mar 2011 15:21:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E2549E7C0 for ; Thu, 31 Mar 2011 08:21:01 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id F03129E7C0 for ; Thu, 31 Mar 2011 08:20:42 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 31 Mar 2011 08:20:42 -0700 Message-Id: X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.63,275,1299484800"; d="scan'208";a="904071046" Received: from unknown (HELO cwilso3-mobl.ger.corp.intel.com) ([10.255.12.233]) by fmsmga001.fm.intel.com with SMTP; 31 Mar 2011 08:20:40 -0700 Received: by cwilso3-mobl.ger.corp.intel.com (sSMTP sendmail emulation); Thu, 31 Mar 2011 16:20:39 +0100 Date: Thu, 31 Mar 2011 16:20:39 +0100 To: Steven Newbury , Jesse Barnes References: <1301501231-27133-1-git-send-email-chris@chris-wilson.co.uk> <20110330130520.49891faf@jbarnes-desktop> <1301584587.2051.2.camel@Nokia-N900> From: Chris Wilson In-Reply-To: <1301584587.2051.2.camel@Nokia-N900> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Reset GMBUS controller after NAK X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 31 Mar 2011 15:21:36 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index d3b903b..ef9f664 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -401,7 +401,7 @@ int intel_setup_gmbus(struct drm_device *dev) bus->reg0 = i | GMBUS_RATE_100KHZ; /* XXX force bit banging until GMBUS is fully debugged */ - if (IS_GEN2(dev)) + if (1) bus->force_bit = intel_gpio_create(dev_priv, i); }