From patchwork Wed Jun 24 13:40:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 6667791 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 59E819F1C1 for ; Wed, 24 Jun 2015 13:40:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D585206D2 for ; Wed, 24 Jun 2015 13:40:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A35B8206A7 for ; Wed, 24 Jun 2015 13:40:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A0506E668; Wed, 24 Jun 2015 06:40:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B15D6E668 for ; Wed, 24 Jun 2015 06:40:33 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 24 Jun 2015 06:40:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,671,1427785200"; d="scan'208";a="733734569" Received: from michelth-linux2.isw.intel.com ([10.102.226.189]) by fmsmga001.fm.intel.com with ESMTP; 24 Jun 2015 06:40:31 -0700 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Wed, 24 Jun 2015 14:40:31 +0100 Message-Id: <1435153231-19606-1-git-send-email-michel.thierry@intel.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1435062089-19877-3-git-send-email-michel.thierry@intel.com> References: <1435062089-19877-3-git-send-email-michel.thierry@intel.com> Subject: [Intel-gfx] [PATCH igt v2] lib: Update intel_require_memory to handle +4GB cases X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Changed size from u32 to u64 to support +4GB. 48-bit PPGTT test cases may need extra memory available. v2: Use thousands separator (Chris) Cc: Chris Wilson Signed-off-by: Michel Thierry Reviewed-by: Chris Wilson --- lib/igt_aux.h | 2 +- lib/intel_os.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/igt_aux.h b/lib/igt_aux.h index 9ea50de..139e5da 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -86,7 +86,7 @@ uint64_t intel_get_avail_ram_mb(void); uint64_t intel_get_total_ram_mb(void); uint64_t intel_get_total_swap_mb(void); -void intel_require_memory(uint32_t count, uint32_t size, unsigned mode); +void intel_require_memory(uint32_t count, uint64_t size, unsigned mode); #define CHECK_RAM 0x1 #define CHECK_SWAP 0x2 diff --git a/lib/intel_os.c b/lib/intel_os.c index f82847f..984bb6a 100644 --- a/lib/intel_os.c +++ b/lib/intel_os.c @@ -215,7 +215,7 @@ intel_get_total_swap_mb(void) * assumption that any test that needs to check for memory requirements is a * thrashing test unsuitable for slow simulated systems. */ -void intel_require_memory(uint32_t count, uint32_t size, unsigned mode) +void intel_require_memory(uint32_t count, uint64_t size, unsigned mode) { /* rough estimate of how many bytes the kernel requires to track each object */ #define KERNEL_BO_OVERHEAD 512 @@ -225,8 +225,8 @@ void intel_require_memory(uint32_t count, uint32_t size, unsigned mode) required *= size + KERNEL_BO_OVERHEAD; required = ALIGN(required, 4096); - igt_debug("Checking %u surfaces of size %u bytes (total %'llu) against %s%s\n", - count, size, (long long)required, + igt_debug("Checking %u surfaces of size %'llu bytes (total %'llu) against %s%s\n", + count, (long long)size, (long long)required, mode & (CHECK_RAM | CHECK_SWAP) ? "RAM" : "", mode & CHECK_SWAP ? " + swap": "");