Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp682432ybh; Tue, 10 Mar 2020 06:24:09 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuEeMui75CGuP+A6/0CT7/0dKsJZ6jR3UXfkdf6jEwcjn7JfaJxTJ5Wj2reVSj6dsDmHoQq X-Received: by 2002:a9d:4c98:: with SMTP id m24mr9196444otf.158.1583846648936; Tue, 10 Mar 2020 06:24:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583846648; cv=none; d=google.com; s=arc-20160816; b=ENz1SxqsE8v1CPhHMZqQFz6J1eOI5ypwILv3xRMIEOmxojLgy/iu312W6cTXcnCJvl Tw1X0HOnvBpMhI6A07CXVPldpll02ZOqqLufDCshOH59jJ+A/WkBeKr0BDaVYTJ8Vu2r fWArdEU6uja+E2QFkfkXrImse9CSS+A09bxQaDyN3dJRjnuf6wPSfqWthx2Eo4nzbb7R DgkjnbEDD3Tr9eSX5tyCCCAfz2CkR/dsbOqIGkczareQObmnaZuyz4JNP/828r3dsJbl dbbZUfcdqBCOyeFWM6x7frhM520A2v8W8c1cAaFPuTDdsHZk19kLUun3yC+NUmJZ523T VxuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U/9ocgNJtYJWfXutWtoGWpgYEgixNoiEcMBA+b7oNeI=; b=tJ8NHJze5/3jEmgot/eZ3g1TtGgjlIZiYk1Wu8pihIebMLzl6LF+aDKQAzbFSeHDXS 5kwPa7yAr/lSEMsGzt8JU+QQ9Y8p0bIwC89XghXJpsvju11URB4YWrcR88rcilcc72L4 QvT1JR3ND2o5gll1p7P+/KdaR/ysHyvvCrQGEuLDjZzeNf3//I1h8ETDQgTvVekDGEH4 eAvWayQss85F+RHdydmhZmdD4TlPTLSGeDvlhakeZycN4RfhrVrC18uPc/d8habbH9JO JVekVjUgU2Bsdh392PyfFC4ewseGL2LbNpq9K0qIojdN3f58y66e1NeF2Zgl3TyTa4DZ woXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g4kY2txU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s2si5622861otp.266.2020.03.10.06.23.54; Tue, 10 Mar 2020 06:24:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g4kY2txU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730368AbgCJNCK (ORCPT + 99 others); Tue, 10 Mar 2020 09:02:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728164AbgCJNCJ (ORCPT ); Tue, 10 Mar 2020 09:02:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF80824649; Tue, 10 Mar 2020 13:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845328; bh=i2Tx8WkeRwQGYG6tH6M0qmIaYvU0N/cvVTJvJ9JVPgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g4kY2txUxdqCqOS97EtvbbXdIUzuybSk/mP2kdsfGl1Y5vJoaB64+dhavFTGz0gAl Q6+RSW8bI+T/U6DtktFR0mpkttmrygrEyLCjR/CFe/Jfky3XcxR1BRlTlFy3PyC7BT 92UwlCya4N5/PNvxSRqlvUZxYE2W0FRVEDAr9NXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Ahzo , Alex Deucher Subject: [PATCH 5.5 143/189] drm/ttm: fix leaking fences via ttm_buffer_object_transfer Date: Tue, 10 Mar 2020 13:39:40 +0100 Message-Id: <20200310123654.294757668@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123639.608886314@linuxfoundation.org> References: <20200310123639.608886314@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ahzo commit 8c8c06207bcfc5a7e5918fc0a0f7f7b9a2e196d6 upstream. Set the drm_device to NULL, so that the newly created buffer object doesn't appear to use the embedded gem object. This is necessary, because otherwise no corresponding dma_resv_fini for the dma_resv_init is called, resulting in a memory leak. The dma_resv_fini in ttm_bo_release_list is only called if the embedded gem object is not used, which is determined by checking if the drm_device is NULL. Bug: https://gitlab.freedesktop.org/drm/amd/issues/958 Fixes: 1e053b10ba60 ("drm/ttm: use gem reservation object") Reviewed-by: Christian König Signed-off-by: Ahzo Signed-off-by: Alex Deucher Signed-off-by: Christian König Link: https://patchwork.freedesktop.org/patch/355089/ Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -516,6 +516,7 @@ static int ttm_buffer_object_transfer(st fbo->base.base.resv = &fbo->base.base._resv; dma_resv_init(&fbo->base.base._resv); + fbo->base.base.dev = NULL; ret = dma_resv_trylock(&fbo->base.base._resv); WARN_ON(!ret);