From mboxrd@z Thu Jan  1 00:00:00 1970
From: Damien Lespiau <damien.lespiau@intel.com>
Subject: Re: [PATCH 1/4] drm/i915: check that the i965g/gm 4G
 limit is really obeyed
Date: Tue, 8 Oct 2013 12:06:24 +0100
Message-ID: <20131008110624.GA27819@strange.amr.corp.intel.com>
References: <1381176948-2754-1-git-send-email-rodrigo.vivi@gmail.com>
	<1381176948-2754-2-git-send-email-rodrigo.vivi@gmail.com>
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 mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id 00CDFE66AA
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  8 Oct 2013 04:06:26 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1381176948-2754-2-git-send-email-rodrigo.vivi@gmail.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>
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: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Oct 07, 2013 at 05:15:45PM -0300, Rodrigo Vivi wrote:
> From: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> In truly crazy circumstances shmem might give us the wrong type of
> page. So be a bit paranoid and double check this.
> 
> Reviewer: Damien Lespiau <damien.lespiau@intel.com>
> Cc: Rob Clark <robdclark@gmail.com>
> References: http://lkml.org/lkml/2011/7/11/238
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 19ecfa8..692ebf7 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1903,6 +1903,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
>  			sg->length += PAGE_SIZE;
>  		}
>  		last_pfn = page_to_pfn(page);
> +
> +		/* Check that the i965g/gm workaround works. */
> +		WARN_ON((gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL));

I guess we could have something like last_pfn >= (GB(4) >> PAGE_SHIFT)
but in any case:

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

-- 
Damien