From patchwork Wed Apr 13 08:51:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 12811752 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 B2050C433F5 for ; Wed, 13 Apr 2022 08:51:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 676F210E124; Wed, 13 Apr 2022 08:51:47 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4204010E0AA; Wed, 13 Apr 2022 08:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649839906; x=1681375906; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vpiItvpgaFPmgHy1U3lf9GHP58gLjqtFS+hfWWpE+zQ=; b=e8fsZJte9V4Xxn1KQ/7+PzMAa+H0rXHuFISxvb6LQuZzzYYx5rQ35xzB 02t1taVon2OUzA574lfyO21juBanStIOeTTKnLR7gzXEyj5+dIiRe/diI D5yqOXb18KmiAp+bVm6i7cBU6qzB883skw6rSvkbjISXQxX5Vz/VLlWEf VOFhwXU2AWmqRI3sQWxBcmT+jTMFFhgWdKmX3L0kgiM0HW0iH/989tC6r eAnKmDPFkFoLSbNLM5JvSoeqyDFV47vVXwiQuujx3LQVnt2X7/mq3vG2K MaFq0fDD/X/nG+g2+E2+gsiSAK92U//n3z4i/Gekl9/sE/k5JjLUbnS7M A==; X-IronPort-AV: E=McAfee;i="6400,9594,10315"; a="249900189" X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="249900189" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2022 01:51:45 -0700 X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="507899289" Received: from jomolloy-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.23.209]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2022 01:51:44 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Wed, 13 Apr 2022 09:51:33 +0100 Message-Id: <20220413085133.275290-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2] drm/ttm: fixup ttm_bo_add_move_fence 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: Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" It looks like we still need to call dma_fence_put() on the man->move, otherwise we just end up leaking it, leading to fireworks later. v2(Daniel): - Simplify the function tail Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5689 Fixes: 8bb31587820a ("drm/ttm: remove bo->moving") Cc: Christian König Cc: Daniel Vetter Signed-off-by: Matthew Auld Reviewed-by: Christian König Reviewed-by: Daniel Vetter --- drivers/gpu/drm/ttm/ttm_bo.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 015a94f766de..f7fbf162ce41 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -740,11 +740,9 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, dma_resv_add_fence(bo->base.resv, fence, DMA_RESV_USAGE_KERNEL); ret = dma_resv_reserve_fences(bo->base.resv, 1); - if (unlikely(ret)) { - dma_fence_put(fence); - return ret; - } - return 0; + + dma_fence_put(fence); + return ret; } /*