From patchwork Sat Mar 18 00:30:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 13179639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EBDEAC74A5B for ; Sat, 18 Mar 2023 00:31:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5606510E158; Sat, 18 Mar 2023 00:31:54 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8913410E158 for ; Sat, 18 Mar 2023 00:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679099511; x=1710635511; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dUbb0D8nIGbiK2hrj1ZUu/Cioymyc/u5PLY952ZNUAg=; b=JiddYYUHr/VzaGg/4mV0rLpDQtTdFo8Dg7eipwNTIyKiksChfWJyoNU9 3mh+L/fyqv+eVnSPLkr48yttBHYz8dlo1ubCs2W7atqXpycwpnEcTWF0r fjrXYXGWKRIkOFsn+ydHtCIU0mj6NggNxHiOX4QVrUysV+ypsEvmJwRkm WcAt5nw+BSjRANrbqoUv1rIYtngAVS9VIxSIiLIQKa9zK0Q9AVJ8FZ7/Z U+NcCJYynKU/u/Cs6WdCBfC5/mv/Pe1MYITt79qOPY0fsxBGPzgTdBa9W xhGWvtdE74k8DzUPhTBBohEYsW5R81mjEc5eYoiVMHmTJoBjLe4bJFqwy g==; X-IronPort-AV: E=McAfee;i="6600,9927,10652"; a="322239322" X-IronPort-AV: E=Sophos;i="5.98,270,1673942400"; d="scan'208";a="322239322" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 17:31:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10652"; a="630467392" X-IronPort-AV: E=Sophos;i="5.98,270,1673942400"; d="scan'208";a="630467392" Received: from relo-linux-5.jf.intel.com ([10.165.21.152]) by orsmga003.jf.intel.com with ESMTP; 17 Mar 2023 17:31:49 -0700 From: John.C.Harrison@Intel.com To: stable@vger.kernel.org Date: Fri, 17 Mar 2023 17:30:57 -0700 Message-Id: <20230318003057.689847-1-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <167820538475156@kroah.com> References: <167820538475156@kroah.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 5.4.y] drm/i915: Don't use stolen memory for ring buffers with LLC X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , intel-gfx@lists.freedesktop.org, Chris Wilson , Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: John Harrison Direction from hardware is that stolen memory should never be used for ring buffer allocations on platforms with LLC. There are too many caching pitfalls due to the way stolen memory accesses are routed. So it is safest to just not use it. Signed-off-by: John Harrison Fixes: c58b735fc762 ("drm/i915: Allocate rings from stolen") Cc: Chris Wilson Cc: Joonas Lahtinen Cc: Jani Nikula Cc: Rodrigo Vivi Cc: Tvrtko Ursulin Cc: intel-gfx@lists.freedesktop.org Cc: # v4.9+ Tested-by: Jouni Högander Reviewed-by: Daniele Ceraolo Spurio Link: https://patchwork.freedesktop.org/patch/msgid/20230216011101.1909009-2-John.C.Harrison@Intel.com (cherry picked from commit f54c1f6c697c4297f7ed94283c184acc338a5cf8) Signed-off-by: Jani Nikula (cherry picked from commit 690e0ec8e63da9a29b39fedc6ed5da09c7c82651) Signed-off-by: John Harrison --- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 808269b2108f..125f7bb67bee 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -1268,10 +1268,11 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) { struct i915_address_space *vm = &ggtt->vm; struct drm_i915_private *i915 = vm->i915; - struct drm_i915_gem_object *obj; + struct drm_i915_gem_object *obj = NULL; struct i915_vma *vma; - obj = i915_gem_object_create_stolen(i915, size); + if (!HAS_LLC(i915)) + obj = i915_gem_object_create_stolen(i915, size); if (!obj) obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj))