From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 2/2] drm/i915: add an explict mmio base for
	gpio/gmbus io
Date: Sun, 25 Mar 2012 22:37:21 +0200
Message-ID: <20120325203721.GE7247@phenom.ffwll.local>
References: <1332542616-2367-1-git-send-email-daniel.vetter@ffwll.ch>
	<1332542616-2367-2-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com
	[209.85.212.171])
	by gabe.freedesktop.org (Postfix) with ESMTP id 9DA1E9EF74
	for <intel-gfx@lists.freedesktop.org>;
	Sun, 25 Mar 2012 13:36:36 -0700 (PDT)
Received: by wibhj13 with SMTP id hj13so2770156wib.12
	for <intel-gfx@lists.freedesktop.org>;
	Sun, 25 Mar 2012 13:36:35 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1332542616-2367-2-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Mar 23, 2012 at 11:43:36PM +0100, Daniel Vetter wrote:
> Again, Valleyview modes these around, so make the mmio base more
> explicit to consolidate the base address computations to one
> HAS_PCH_SPLIT check.
> 
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_drv.h  |    5 +++++
>  drivers/gpu/drm/i915/intel_i2c.c |   15 ++++++++-------
>  2 files changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index f2f9dd9..9bd8320 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h

...

> @@ -359,6 +355,11 @@ int intel_setup_gmbus(struct drm_device *dev)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	int ret, i;
>  
> +	if (HAS_PCH_SPLIT(dev))
> +		dev_priv->gpio_mmio_base = 0;
> +	else
> +		dev_priv->gpio_mmio_base = PCH_GPIOA - GPIOA;

This would work so much better if I hadn't mixed up the PCH_SPLIT case
here ... so much for testing before hitting send. Fixed in d-i-n-q.
-Daniel

-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48