From patchwork Mon Oct 7 20:15:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 2999001 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CC346BF924 for ; Mon, 7 Oct 2013 20:17:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AA8A20213 for ; Mon, 7 Oct 2013 20:17:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 26A7320212 for ; Mon, 7 Oct 2013 20:17:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1365CE6E46 for ; Mon, 7 Oct 2013 13:17:08 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ye0-f175.google.com (mail-ye0-f175.google.com [209.85.213.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 26782E7504 for ; Mon, 7 Oct 2013 13:16:18 -0700 (PDT) Received: by mail-ye0-f175.google.com with SMTP id q8so1722044yen.34 for ; Mon, 07 Oct 2013 13:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9W5KsfD6irSWx991HQ1vMbhVNkdQ2UUvlyGX/1abdQc=; b=rzKUs3uFj13kya2kN0Ywhs+/HpwvghcSseYFVu7w0jKclbqhea/rj5GcktTJYuAxL1 ostVlNZr+f+CEO5bOWFYXs+kNH0t5WJN0FDyMEXQvVp7069tu9AHwbqYxAA2pVEvGWin 5JuyicYibCXzRQZF/8pJNPM2ocGOwadjDQc3YgbR6RTaRk42lArPGIwcQfhynopm1dNc mpWUiuSS3LfdU9Smq4tAqaeZJXxJkz1efksgr/j1WGkc52D9jsOCHdTzS5GTyHJswiaT nce1iURN2vSg1+vvzP8bngh0m+5Of9uvvtR9Dopr2RsaqFcBchKA2EuhCdQGLH7Zf7pI 01Dg== X-Received: by 10.236.31.195 with SMTP id m43mr2443508yha.88.1381176977576; Mon, 07 Oct 2013 13:16:17 -0700 (PDT) Received: from localhost.localdomain (200.188.217.18.dedicated.neoviatelecom.com.br. [200.188.217.18]) by mx.google.com with ESMTPSA id 48sm46243569yhq.11.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 07 Oct 2013 13:16:17 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Mon, 7 Oct 2013 17:15:45 -0300 Message-Id: <1381176948-2754-2-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1381176948-2754-1-git-send-email-rodrigo.vivi@gmail.com> References: <1381176948-2754-1-git-send-email-rodrigo.vivi@gmail.com> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/4] drm/i915: check that the i965g/gm 4G limit is really obeyed X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Vetter 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 Cc: Rob Clark References: http://lkml.org/lkml/2011/7/11/238 Signed-off-by: Daniel Vetter Signed-off-by: Rodrigo Vivi Reviewed-by: Damien Lespiau --- 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)); } #ifdef CONFIG_SWIOTLB if (!swiotlb_nr_tbl())