From patchwork Wed Apr 13 13:50:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8822491 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2C20DC0553 for ; Wed, 13 Apr 2016 13:50:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 106F72026C for ; Wed, 13 Apr 2016 13:50:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3753A201F5 for ; Wed, 13 Apr 2016 13:50:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB9846E3E7; Wed, 13 Apr 2016 13:50:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45AF56E3E7 for ; Wed, 13 Apr 2016 13:50:34 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a140so14182642wma.2 for ; Wed, 13 Apr 2016 06:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=yx4mvZpkUdEQmGfMO2dksQHltZMUyDDMN+1dTPdwkF0=; b=HA4UjBzjptSGm3rOAQmEvQtTEz48Q5gaM5rBplEHweqGyl9bTDP+b+5CNWPo+S0QfR gbTZBLmSYbUDjZf4ncRGokdIZCcdKJK2RVmu0aGYaCNl8/r9X/AZzEK8l65M/XLExJU4 2SpDhcZuANfD+o4+Ia+nq2CCKsvti4r8ef2rJYSsMsUTbilm4u+jmcErJBRQ41lPNC+X KSYCZUl2IVkVnQdne9WDblX3INDev984RCcFnDDGC0t1mFpLj4vwAlqoy0qyKaMPBcR1 artb2A99DEKbU2ML2dU/kAxedZF4Ke9mftl8eAgiJo4cleAbPxHPzgObkIhE+oPhmpZQ bNtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=yx4mvZpkUdEQmGfMO2dksQHltZMUyDDMN+1dTPdwkF0=; b=Een45JpdGkSp/j7cndvcYqqiykGe724WsDQQ/WDF+7eWJWQCEaus5WYC9JjF6s+pbk 29BZ3Xwb7XbdrEQvc8Jwl8wR3P12/85DbmruvyAKXe+64pmUk8I05GbtY2xlhINREUuK NLAzTk3c5PLNhlTMOEAjWH7M0XVZevoL3F7NLqP3Z/rJvh7XQzjXJnV23Q2uZd8dizPg /yKrA1fLKJgELTNCbVJP2sW+6JuHHIwyeOeYE4cxNZ/3m1G5AcoFt1i1Y4RswISA6fQB BDzv5oavRdjcHl69bqD1wt19J8WC7Y6dXC41KgyoPnw7a6GIqDF9B5NiFNFltxGjbq2/ sLhw== X-Gm-Message-State: AOPr4FXwHtsKDaNEGuM3XeTYqx0u8v4Y8vFKstcPMpB0Cr2cnIhUzpX+ctMCobjIVPkkqA== X-Received: by 10.28.144.20 with SMTP id s20mr10994986wmd.12.1460555432799; Wed, 13 Apr 2016 06:50:32 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 202sm9055527wmw.5.2016.04.13.06.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 06:50:31 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 13 Apr 2016 14:50:22 +0100 Message-Id: <1460555422-5719-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.0.rc3 Subject: [Intel-gfx] [for-CI] no-used-pml4 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 --- drivers/gpu/drm/i915/i915_gem_gtt.c | 47 +++++++++++++------------------------ drivers/gpu/drm/i915/i915_gem_gtt.h | 2 -- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 6e158b3d3ea0..dff14343a4f8 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -923,8 +923,8 @@ static void gen8_ppgtt_cleanup_4lvl(struct i915_hw_ppgtt *ppgtt) { int i; - for_each_set_bit(i, ppgtt->pml4.used_pml4es, GEN8_PML4ES_PER_PML4) { - if (WARN_ON(!ppgtt->pml4.pdps[i])) + for (i = 0; i < GEN8_PML4ES_PER_PML4; i++) { + if (ppgtt->pml4.pdps[i] == NULL) continue; gen8_ppgtt_cleanup_3lvl(&ppgtt->base, ppgtt->pml4.pdps[i]); @@ -1061,18 +1061,17 @@ gen8_ppgtt_alloc_page_dirpointers(struct i915_address_space *vm, uint32_t pml4e; gen8_for_each_pml4e(pdp, pml4, start, length, pml4e) { - if (!test_bit(pml4e, pml4->used_pml4es)) { - pdp = alloc_pdp(vm); - if (IS_ERR(pdp)) - return PTR_ERR(pdp); - - gen8_initialize_pdp(vm, pdp); - pml4->pdps[pml4e] = pdp; - trace_i915_page_directory_pointer_entry_alloc(vm, - pml4e, - start, - GEN8_PML4E_SHIFT); - } + if (pml4->pdps[pml4e]) + continue; + + pdp = alloc_pdp(vm); + if (IS_ERR(pdp)) + return PTR_ERR(pdp); + + gen8_initialize_pdp(vm, pdp); + pml4->pdps[pml4e] = pdp; + trace_i915_page_directory_pointer_entry_alloc(vm, pml4e, start, + GEN8_PML4E_SHIFT); } return 0; @@ -1170,15 +1169,10 @@ static int gen8_alloc_va_range_4lvl(struct i915_address_space *vm, uint64_t start, uint64_t length) { - DECLARE_BITMAP(new_pdps, GEN8_PML4ES_PER_PML4); struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm); struct i915_page_directory_pointer *pdp; uint64_t pml4e; - int ret = 0; - - /* Do the pml4 allocations first, so we don't need to track the newly - * allocated tables below the pdp */ - bitmap_zero(new_pdps, GEN8_PML4ES_PER_PML4); + int ret; /* The pagedirectory and pagetable allocations are done in the shared 3 * and 4 level code. Just allocate the pdps. @@ -1192,21 +1186,12 @@ static int gen8_alloc_va_range_4lvl(struct i915_address_space *vm, ret = gen8_alloc_va_range_3lvl(vm, pdp, start, length); if (ret) - goto err_out; + return ret; gen8_setup_page_directory_pointer(ppgtt, pml4, pdp, pml4e); } - bitmap_or(pml4->used_pml4es, new_pdps, pml4->used_pml4es, - GEN8_PML4ES_PER_PML4); - return 0; - -err_out: - for_each_set_bit(pml4e, new_pdps, GEN8_PML4ES_PER_PML4) - gen8_ppgtt_cleanup_3lvl(vm, pml4->pdps[pml4e]); - - return ret; } static int gen8_alloc_va_range(struct i915_address_space *vm, @@ -1294,7 +1279,7 @@ static void gen8_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) struct i915_page_directory_pointer *pdp; gen8_for_each_pml4e(pdp, pml4, start, length, pml4e) { - if (!test_bit(pml4e, pml4->used_pml4es)) + if (pml4->pdps[pml4e] == NULL) continue; seq_printf(m, " PML4E #%llu\n", pml4e); diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index 15b3f2e1c697..4fea0ef24345 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -311,8 +311,6 @@ struct i915_page_directory_pointer { struct i915_pml4 { struct i915_page_dma base; - - DECLARE_BITMAP(used_pml4es, GEN8_PML4ES_PER_PML4); struct i915_page_directory_pointer *pdps[GEN8_PML4ES_PER_PML4]; };