From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 12/81] drm/i915: create VLV_DSIPLAY_BASE
	#define
Date: Fri, 20 Jul 2012 14:07:39 +0200
Message-ID: <20120720120739.GB5544@phenom.ffwll.local>
References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch>
	<1342016944-23395-13-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-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43])
	by gabe.freedesktop.org (Postfix) with ESMTP id BF41D9E7A0
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 20 Jul 2012 05:07:34 -0700 (PDT)
Received: by wgbdr1 with SMTP id dr1so2761784wgb.12
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 20 Jul 2012 05:07:33 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1342016944-23395-13-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 Wed, Jul 11, 2012 at 04:27:55PM +0200, Daniel Vetter wrote:
> Will be used more in the next patch.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Jesse's not around to ack this and Paulo punted. So I've just merged this.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_drv.c |    2 +-
>  drivers/gpu/drm/i915/i915_reg.h |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index e754cdf..116670e 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1032,7 +1032,7 @@ static bool IS_DISPLAYREG(u32 reg)
>  	 * This should make it easier to transition modules over to the
>  	 * new register block scheme, since we can do it incrementally.
>  	 */
> -	if (reg >= 0x180000)
> +	if (reg >= VLV_DISPLAY_BASE)
>  		return false;
>  
>  	if (reg >= RENDER_RING_BASE &&
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index cc82871..e982900 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -528,6 +528,8 @@
>  #define   GFX_PSMI_GRANULARITY		(1<<10)
>  #define   GFX_PPGTT_ENABLE		(1<<9)
>  
> +#define VLV_DISPLAY_BASE 0x180000
> +
>  #define SCPD0		0x0209c /* 915+ only */
>  #define IER		0x020a0
>  #define IIR		0x020a4
> -- 
> 1.7.7.6
> 

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