From patchwork Thu Jun 22 10:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Hellstr=C3=B6m?= X-Patchwork-Id: 111613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4974537vqr; Thu, 22 Jun 2023 03:56:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6nKcnVBIH/7b7z/Dcoh2jPgQdjhmC8jeS5R/ovp2DREeAc15yLo6+Jua/H25t4fU7cDAOo X-Received: by 2002:a17:902:aa05:b0:1b6:82a5:13d5 with SMTP id be5-20020a170902aa0500b001b682a513d5mr6251747plb.9.1687431399851; Thu, 22 Jun 2023 03:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687431399; cv=none; d=google.com; s=arc-20160816; b=X4j5LGrOgsNGzOFLfVHJ1tRvoTH7LZ200stvZ/e2Pbqo+HQuMigUYH4bCYbzxrwiSj QS/v9jEna6vr+40/hWM+zYBkMyPWsZ6WULzSfowlg3IFkFsmuYqlRTSEVEkahAo52pRf CUMkHrQ2MYFmmsB9ZQqBgLwUbKI0qMWF7fLYiwySoji7u5bySORPoizIkUyb0fAzZ1Mw exbVuygI0k5btlclXBZiNDfIawhmkCVNtHngs6GcxpcrbnjA3x7dHA/R/Z9JmBKfLnR0 omKU8Ok6P4RIW2u/n4BtFkGSIWLmdd6h1Tuo6uDhHjYxuyq1tWc///A/DJWIWjFI/TjU OVtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K5BQAqsI+CyKMqj56ZlQosX2NbPhttKqN4s7ZzMSgFM=; b=rl+WvflxzmrlCFsvjxltfRl4HAP2q5ThSABEK3Eag3AQJBobdurbLGVkyfpo+SV4Bd EXlxIzJ/TRVTkdHr8OcSzIafnOn+GSdTJrM+UBD+GN5vtmG/sYngLWx/DO5lzN7Nsomg eRjlLeyZnvs2PPjB/nVOhtQiZKqSmS7OIaZSICWlkJsbdqLgSx9OvwRz5aLT9fcqxibp QqAZ3lPXmbiG94edyA5ERarzX+06AJI6jefA6hnIfHZXYKp2xkX2S9ZLX2O4hiAzijaz R6L2o/W0pnwRJbyoEV1PiNlNYakhwN962rSVpAnMLCnw0RGotCJ3Ok+mEHVA8UQbhcq0 I2VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NIdkWd5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a9-20020a170902ee8900b001b1a2c14a48si5965868pld.141.2023.06.22.03.56.26; Thu, 22 Jun 2023 03:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NIdkWd5m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231442AbjFVKVC (ORCPT + 99 others); Thu, 22 Jun 2023 06:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjFVKUs (ORCPT ); Thu, 22 Jun 2023 06:20:48 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88853107; Thu, 22 Jun 2023 03:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429244; x=1718965244; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8NHvqn83ZvFUkevP/WNZb8GNDLDy33tL9NNl4xX0eyI=; b=NIdkWd5mHZL9UY4htMstZhg8nR/Sgl3yH/KItcIy3yiylsK25OblDFTU 3tC4BVBdnqpLBKuHWW/IclNEYdUVe45vgR9hUAE/s2Oyp75T28sjAlJ7L k3E621IYdg1jdUyhirrG+HZsBXMtQSmh5OQowXxU/cgBZRIXsoCQs0Jr/ V7A2mWx1Ifpg39yeE0kNgDWsWCbccQS4zji0plXVoKVmaTMtB2EwzcwvO 4afdJ22qu2k/wRQVAK5L+k9cHg85i7B5lt8wLfhJXHJeJ9z7dIcSRzkdS QnKSDIrylaRtEt4HFVJ5YixW/0t5hHgHhCPB+Ys52vPRjQy7FHXQXpch8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182274" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182274" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692194052" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692194052" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:14:49 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Christian_K=C3=B6nig?= , Roger He , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Matthew Brost , linux-kernel@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= Subject: [PATCH 2/4] drm/ttm: Don't shadow the operation context Date: Thu, 22 Jun 2023 12:14:10 +0200 Message-Id: <20230622101412.78426-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769400067407673555?= X-GMAIL-MSGID: =?utf-8?q?1769400067407673555?= ttm_bo_swapout() shadows the ttm operation context which may cause major confusion in driver callbacks when swapping out !TTM_PL_SYSTEM memory. Fix this by reusing the operation context argument to ttm_bo_swapout(). Cc: "Christian König" Cc: Roger He Cc: Cc: Cc: # v4.16+ Fixes: dc947770cf34 ("drm/ttm: enable swapout for reserved BOs during allocation") Signed-off-by: Thomas Hellström Acked-by: Matthew Brost --- drivers/gpu/drm/ttm/ttm_bo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index bd5dae4d1624..615d30c4262d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1154,7 +1154,6 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, * Move to system cached */ if (bo->resource->mem_type != TTM_PL_SYSTEM) { - struct ttm_operation_ctx ctx = { false, false }; struct ttm_resource *evict_mem; struct ttm_place hop; @@ -1164,7 +1163,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, if (unlikely(ret)) goto out; - ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop); + ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); if (unlikely(ret != 0)) { WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); goto out;