From patchwork Mon Feb 20 12:47:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9582705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55FF160578 for ; Mon, 20 Feb 2017 12:47:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47A9528113 for ; Mon, 20 Feb 2017 12:47:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ACCD28358; Mon, 20 Feb 2017 12:47:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82D8128113 for ; Mon, 20 Feb 2017 12:47:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF0A46E3CE; Mon, 20 Feb 2017 12:47:23 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F0176E3CE for ; Mon, 20 Feb 2017 12:47:22 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id c85so14195726wmi.1 for ; Mon, 20 Feb 2017 04:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=k32cqMhAya80snzNJWyaSm7wKvLk5gXcbo8g1xXR3Ns=; b=NviILj1PNCz3ajZljSlgo65tFgtosNJhNd7A2sXiO4t29WlrjK8TS1om2uLI9VdsR2 JdBYNBlpx2wzfVrvtkRbRsRe0GX025KMQkEM1dNYUisHvfYuY+osUrkwi7VBphivyK+l 2JXOBUxoAtgI9FC+XMdkB1f6v+vy0FQpsst7xkQg7XNO6Xr0gCCHivnQeJ7zKoU5WuJN 3DU97laNXM/m6379UocXE3QKgOAQw9nNxc09L8cVBMbYLma/3LJ94xupyMvCUhMDELcM RKfgoBT6cGWyOuKgZ1ws7TVWfU5w5hm79QM5yYdJASr29MNy0xV4zj5oKEXXMZpOWpXU bzgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=k32cqMhAya80snzNJWyaSm7wKvLk5gXcbo8g1xXR3Ns=; b=bf/XFFxu1/kNZdzuIljv/xcRLaDyihLcnmqo6x9QKXmgfG3+cfnVuM6eN+767A4K1R 1JOjZCpp6vocHfFOY76t5dvB4WDD9BoVoStdJSPrYZe7MbOTtE+WvYMLlGFRzKRo+q71 3xWx+y9F+xDR7Vc2XhaeftD278orXYxlQikcC88q/OAhUy5u38vZGX+gM0GMRrvH7uqp a0QmjHtTF+4KM2UWZK6JCw/4MR03bo9U39tQoZ03chyQE//j6lnoL8dWiCv+u9A1LHkR BQom4HnFivS2VdaRKKtD7FBrMbO4iei9hyBqc6yxTN6TBbrOwR8aE1u/26KSD+mEwTiM SCcA== X-Gm-Message-State: AMke39krGnxqO9ghP5Z5ZhfT1VVUdx/sLICIiTbvRFwSSluYK3/wC30b/sdC1I0lNqiTPQ== X-Received: by 10.28.46.74 with SMTP id u71mr10095610wmu.136.1487594841016; Mon, 20 Feb 2017 04:47:21 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id e16sm24680697wra.36.2017.02.20.04.47.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 04:47:20 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Feb 2017 12:47:18 +0000 Message-Id: <20170220124718.14796-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Remove Braswell GGTT update w/a 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-Virus-Scanned: ClamAV using ClamSMTP Testing with concurrent GGTT accesses no longer show the coherency problems from yonder, commit 5bab6f60cb4d ("drm/i915: Serialise updates to GGTT with access through GGTT on Braswell"). My presumption is that the root cause was more likely fixed by commit 3b5724d702ef ("drm/i915: Wait for writes through the GTT to land before reading back"), along with the use of WC updates to the global gTT in commit 8448661d65f6 ("drm/i915: Convert clflushed pagetables over to WC maps". Given that the original symptoms can no longer be reproduced, time to remove the workaround. Testcase: igt/gem_concurrenct_blit Signed-off-by: Chris Wilson Cc: Daniel Vetter Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_gtt.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 18c051a11b7d..8302dae0b9c6 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2085,32 +2085,6 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, ggtt->invalidate(vm->i915); } -struct insert_entries { - struct i915_address_space *vm; - struct sg_table *st; - u64 start; - enum i915_cache_level level; - u32 flags; -}; - -static int gen8_ggtt_insert_entries__cb(void *_arg) -{ - struct insert_entries *arg = _arg; - gen8_ggtt_insert_entries(arg->vm, arg->st, - arg->start, arg->level, arg->flags); - return 0; -} - -static void gen8_ggtt_insert_entries__BKL(struct i915_address_space *vm, - struct sg_table *st, - u64 start, - enum i915_cache_level level, - u32 flags) -{ - struct insert_entries arg = { vm, st, start, level, flags }; - stop_machine(gen8_ggtt_insert_entries__cb, &arg, NULL); -} - static void gen6_ggtt_insert_page(struct i915_address_space *vm, dma_addr_t addr, u64 offset, @@ -2762,8 +2736,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->base.clear_range = gen8_ggtt_clear_range; ggtt->base.insert_entries = gen8_ggtt_insert_entries; - if (IS_CHERRYVIEW(dev_priv)) - ggtt->base.insert_entries = gen8_ggtt_insert_entries__BKL; ggtt->invalidate = gen6_ggtt_invalidate;