Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3718259pxv; Mon, 26 Jul 2021 10:09:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyi1X1U7Re1xOl3gKgIEwYPAnK0WU5RHC2O2VC6QnAy55DXPTXKk6qKxkI+7PD+wED73PA6 X-Received: by 2002:aa7:c38d:: with SMTP id k13mr22449425edq.178.1627319349868; Mon, 26 Jul 2021 10:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627319349; cv=none; d=google.com; s=arc-20160816; b=o1MyJWVynFFYs9OR3lf3FYncLdgNFWORy23QDj9w6bfcl6QVhfCW4HiS5ekaw2t4NV tfBjiyQKIx6cMAPqDAn8C4Dsr0lgcxBdE/Se/7SeejTFdCZcX0JjROe7wQXy/eZrlGBP hTSc99Uv1/k+oH0ftK4ftoHbcRC5I0UfRHU3apFtKbygejanjoj2DxwruYMiwm9l2K2T pI1XWdNyBIkfAivDBVqhEU7qF3mEkcxFB7Y7cHFKxe+CEjQVS8qSDFgJP1cEk3/Uy4IF 2R2213w6ORB3z2Gd/NIvxeawsRwGCnYZDYmqcR2gePCK4IwRyhjEts6/PpY2Y9W57dFi LviA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tgxK6MXwkoan8iZQDlGJ4W7BwXC7BGS5YOTf5b/+tCQ=; b=pcvCblfAJK0M1Lf2eCitfD1sEa5a59b34RKNZ4lZBIHaAMQ7Sv7BI9k9h2qIaZCoMI fccqgPTe7P/2xvpLnrXPG2k0vsQBm3bCsEKbRg/RdBb5NX1XWRv3wdru16fj+FDDQ1Hh NhaDP8lInFfbbt4a+7kOf7KHvTpcdoUh6IYVnV9Dlcxrtzho54FziQz9fSlbqgQPoywQ ntFev4QiYtDekpfMklnXXufwkbaYrCO9zBmmJdyniKh7N6sfvakkkBPmKGtH/91wCW+C ThqLAi9KuJ2jl8H3Kcb62wJ9OM/8dTG1xOV63zTXWYPn6g5C6xISGUJD2L4BJlBKBbgO 2VMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PlOl05AP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si38713edq.599.2021.07.26.10.08.42; Mon, 26 Jul 2021 10:09:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PlOl05AP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238894AbhGZPsW (ORCPT + 99 others); Mon, 26 Jul 2021 11:48:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:44936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238017AbhGZP3l (ORCPT ); Mon, 26 Jul 2021 11:29:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 71CA060240; Mon, 26 Jul 2021 16:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627315809; bh=KNFYws57n4zXku7Nd/PLxb09tfrH2i/PZaiswKkAZgU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PlOl05APnwCSC99iaHX0XOubkMIQcO8BPvPPRBksiY0VANKrh2XcRTPziWqqHOayq NP23Gr/J8iuvY7FWgQHQ657P5vT1D5Ng1vGsg4jlLJcVjLWfH2a8uzPTPmGNIPGAG3 JcJ+a8gICWxZ8a5dL6Xm8YymD2zySup/p9Dmvfe4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zack Rusin , Martin Krastev , Sasha Levin Subject: [PATCH 5.13 029/223] drm/vmwgfx: Fix a bad merge in otable batch takedown Date: Mon, 26 Jul 2021 17:37:01 +0200 Message-Id: <20210726153847.203796851@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153846.245305071@linuxfoundation.org> References: <20210726153846.245305071@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zack Rusin [ Upstream commit 34bd46bcf3de72cbffcdc42d3fa67e543d1c869b ] Change 2ef4fb92363c ("drm/vmwgfx: Make sure bo's are unpinned before putting them back") caused a conflict in one of the drm trees and the merge commit 68a32ba14177 ("Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm") accidently re-added code that the original change was removing. Fixed by removing the incorrect buffer unpin - it has already been unpinned two lines above. Fixes: 68a32ba14177 ("Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm") Signed-off-by: Zack Rusin Reviewed-by: Martin Krastev Link: https://patchwork.freedesktop.org/patch/msgid/20210615182336.995192-4-zackr@vmware.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c index 5648664f71bc..f2d625415458 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c @@ -354,7 +354,6 @@ static void vmw_otable_batch_takedown(struct vmw_private *dev_priv, ttm_bo_unpin(bo); ttm_bo_unreserve(bo); - ttm_bo_unpin(batch->otable_bo); ttm_bo_put(batch->otable_bo); batch->otable_bo = NULL; } -- 2.30.2