Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4618017imu; Tue, 8 Jan 2019 03:27:02 -0800 (PST) X-Google-Smtp-Source: ALg8bN4rHqQYRC08UwGIqqaR1Be42qxm95Be1tTIpbr5P1YcMdK6/HkvkmF8oMfgVCm1RiC1mmum X-Received: by 2002:a62:43c1:: with SMTP id l62mr1400286pfi.22.1546946822320; Tue, 08 Jan 2019 03:27:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546946822; cv=none; d=google.com; s=arc-20160816; b=gvrzPxH5oGCVIintnjUdlz2EN9wPDklHMu5xisTwMHAHhjouGrEvsJBFquXoD3ka56 hUR51j/Op+Tmlf+09lfBLv9EXku6HHxhGDPDsfhaTrxF4TamqgRJQIc88mmM976OQhAD s6dHuVFjln9vEXVEWXJ03r3lwGEu0ohH2GQhBMl1hVn8S7ihiYxGnhrVyhpkKhlPuX3W Eyh0dXUYvVY2K84vA/kJhuBFXzBtkkuXpON+Zq0iuGYOIhoKHc3VJCF9aioxBLS9+jA5 szdkjV5Af3jCMwk0jfSJytvUTr0jZ4kub7WqQStA2UWfFaHusNaUwqkRNMioTyGXHIzz JMEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=uXYJHdBH6HT6JeHVulAJbpoEETROqSS/qkfaPUnyvUw=; b=s4nrDtcLQ3tmjicu9InFQJmzBJ9GnZKwdYZuibdvWkcvg3SiB1GIaxYZcfEkkQSJBg Zrgl+rT4G1KCF8V39S5ml4LsKmbOo6bFtrNB5LwvmlX9Pd7bsalJUgz3D5AVuJ4J4LQn YONHVQUYbS9Skc47ZiyzC6N9Gx1wCrQYT8MZPHJo8JRuTGP/s733dTuSsJCAx0/Ddh6n GNtrXCNCj1AjfB7a03s7JdQahAkttGmu4gwHMJfjBlAiMntEeJqUr+IYyxBK/34wDzax WeO6p3jj3st7+ojd49ryy6db28Uwcr9ocBgiZP9ErayFGnjnroMTum2vIvBzSz2JcCc/ jE3w== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m75si18555816pga.432.2019.01.08.03.26.46; Tue, 08 Jan 2019 03:27:02 -0800 (PST) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728717AbfAHLZa (ORCPT + 99 others); Tue, 8 Jan 2019 06:25:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54580 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728679AbfAHLZ0 (ORCPT ); Tue, 8 Jan 2019 06:25:26 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41DA1637FE; Tue, 8 Jan 2019 11:25:26 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-98.ams2.redhat.com [10.36.116.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B08B5C21C; Tue, 8 Jan 2019 11:25:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B9CA55EE7; Tue, 8 Jan 2019 12:25:21 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org, David Airlie Cc: andr2000@gmail.com, Gerd Hoffmann , David Airlie , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR BOCHS VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 15/15] drm/bochs: reserve bo for pin/unpin Date: Tue, 8 Jan 2019 12:25:19 +0100 Message-Id: <20190108112519.27473-16-kraxel@redhat.com> In-Reply-To: <20190108112519.27473-1-kraxel@redhat.com> References: <20190108112519.27473-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 08 Jan 2019 11:25:26 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The buffer object must be reserved before calling ttm_bo_validate for pinning/unpinning. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/bochs/bochs_mm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c index cfe061c25f..970a591908 100644 --- a/drivers/gpu/drm/bochs/bochs_mm.c +++ b/drivers/gpu/drm/bochs/bochs_mm.c @@ -223,7 +223,11 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag) bochs_ttm_placement(bo, pl_flag); for (i = 0; i < bo->placement.num_placement; i++) bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; + ret = ttm_bo_reserve(&bo->bo, true, false, NULL); + if (ret) + return ret; ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); + ttm_bo_unreserve(&bo->bo); if (ret) return ret; @@ -247,7 +251,11 @@ int bochs_bo_unpin(struct bochs_bo *bo) for (i = 0; i < bo->placement.num_placement; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; + ret = ttm_bo_reserve(&bo->bo, true, false, NULL); + if (ret) + return ret; ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); + ttm_bo_unreserve(&bo->bo); if (ret) return ret; -- 2.9.3