From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 05/89] drm/i915/skl: i915_swizzle_info gen9
 fix
Date: Thu, 4 Sep 2014 15:14:45 +0200
Message-ID: <20140904131445.GO15520@phenom.ffwll.local>
References: <1409830075-11139-1-git-send-email-damien.lespiau@intel.com>
 <1409830075-11139-6-git-send-email-damien.lespiau@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-we0-f176.google.com (mail-we0-f176.google.com
 [74.125.82.176])
 by gabe.freedesktop.org (Postfix) with ESMTP id 718C96E61E
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Sep 2014 06:14:24 -0700 (PDT)
Received: by mail-we0-f176.google.com with SMTP id q59so10208888wes.7
 for <intel-gfx@lists.freedesktop.org>; Thu, 04 Sep 2014 06:14:23 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1409830075-11139-6-git-send-email-damien.lespiau@intel.com>
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>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Sep 04, 2014 at 12:26:31PM +0100, Damien Lespiau wrote:
> From: Robert Beckett <robert.beckett@intel.com>
> 
> Fix ARB_MODE register read for gen >= 8 in i915_swizzle_info
> 
> Signed-off-by: Robert Beckett <robert.beckett@intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

given that the swizzle stuff is gone, shouldn't we just have a gen9+
check to do nothing?
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index d8389b2..88a4643 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1971,7 +1971,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
>  			   I915_READ(MAD_DIMM_C2));
>  		seq_printf(m, "TILECTL = 0x%08x\n",
>  			   I915_READ(TILECTL));
> -		if (IS_GEN8(dev))
> +		if (INTEL_INFO(dev)->gen >= 8)
>  			seq_printf(m, "GAMTARBMODE = 0x%08x\n",
>  				   I915_READ(GAMTARBMODE));
>  		else
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch