From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AFE9C10F14 for ; Tue, 8 Oct 2019 18:44:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17708206C0 for ; Tue, 8 Oct 2019 18:44:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570560257; bh=NYx6/zYucp7mbaMpLZublcG7SKn8astVwS+wP1VDp88=; h=Subject:To:Cc:From:Date:List-ID:From; b=Sc5lZOSXvE40Hoa4WS/XDEhUNzHURQZJV8kCG+AWjJG+4bRwNc1LDnoT161LsUlg7 OiQnJo8qOJvYNfvpLQa/UdTVh2q7PmFrR1ASyvtPNMycra1JFzD4rme0TQ4TTlzb78 XbtYjd5rC0tLG6ggc4ZjzRDnmx8dWQ0SgxHj0dA8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727336AbfJHSoQ (ORCPT ); Tue, 8 Oct 2019 14:44:16 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41411 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726138AbfJHSoQ (ORCPT ); Tue, 8 Oct 2019 14:44:16 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 61E7121785; Tue, 8 Oct 2019 14:44:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 08 Oct 2019 14:44:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=GVxgzG YUMCspn8M6BCU7j0tfw4K9wS4Tbf2ZV0ZagaI=; b=UaUHt6TVJ3eMiiO+4ARmWw cL8GkZMaaTykfFY+E9lwZyJUk0UVSOztHRdc3fXbldtAGC3cBNqcRZUqzDI4wCd+ HEEgLA9KuZWpAXpMi00sNbf/T2V4xGg6QhkJzJlUyT5ZVazzeDWWd4XbRY3dX1rt U3KE8y9EqG1iZ9x5Hlxctx6OyD5Gw31d14+uXb3d1gBqC+fgX3iJjPfeJL6dfoCo W9FojqVUfd6ERKMESs1zp6Je0b6vXoyO2Z2SXL2Eq63tKaLY4OtxNz9U1HmYhaEF Jf+OKPNxLea14AyErLrNxEUk9tVy4JJ3t44CXkQiaivdrYzCZwDRr4Cjke80RLvQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrheelgddufeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgnecukfhppeekfedrke eirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghh rdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 1F0F5D60066; Tue, 8 Oct 2019 14:44:14 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/i915: Flush extra hard after writing relocations through" failed to apply to 5.3-stable tree To: chris@chris-wilson.co.uk, prathap.kumar.valsan@intel.com Cc: From: Date: Tue, 08 Oct 2019 20:44:12 +0200 Message-ID: <157056025210325@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.3-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 576f05865581f82ac988ffec70e4e2ebd31165db Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 30 Jul 2019 12:21:51 +0100 Subject: [PATCH] drm/i915: Flush extra hard after writing relocations through the GTT Recently discovered in commit bdae33b8b82b ("drm/i915: Use maximum write flush for pwrite_gtt") was that we needed to our full write barrier before changing the GGTT PTE to ensure that our indirect writes through the GTT landed before the PTE changed (and the writes end up in a different page). That also applies to our GGTT relocation path. Signed-off-by: Chris Wilson Cc: stable@vger.kernel.org Reviewed-by: Prathap Kumar Valsan Link: https://patchwork.freedesktop.org/patch/msgid/20190730112151.5633-4-chris@chris-wilson.co.uk diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index cbd7c6e3a1f8..4db4463089ce 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1014,11 +1014,12 @@ static void reloc_cache_reset(struct reloc_cache *cache) kunmap_atomic(vaddr); i915_gem_object_finish_access((struct drm_i915_gem_object *)cache->node.mm); } else { - wmb(); + struct i915_ggtt *ggtt = cache_to_ggtt(cache); + + intel_gt_flush_ggtt_writes(ggtt->vm.gt); io_mapping_unmap_atomic((void __iomem *)vaddr); - if (cache->node.allocated) { - struct i915_ggtt *ggtt = cache_to_ggtt(cache); + if (cache->node.allocated) { ggtt->vm.clear_range(&ggtt->vm, cache->node.start, cache->node.size); @@ -1073,6 +1074,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj, void *vaddr; if (cache->vaddr) { + intel_gt_flush_ggtt_writes(ggtt->vm.gt); io_mapping_unmap_atomic((void __force __iomem *) unmask_page(cache->vaddr)); } else { struct i915_vma *vma; @@ -1114,7 +1116,6 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj, offset = cache->node.start; if (cache->node.allocated) { - wmb(); ggtt->vm.insert_page(&ggtt->vm, i915_gem_object_get_dma_address(obj, page), offset, I915_CACHE_NONE, 0);