Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2399524ybi; Mon, 17 Jun 2019 04:15:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzNcHpNbp7d90yqzR3/fefyGvLDeO4LssdGLKQP+Wr6KuzC6B7btuVphPtLWts+YASYVDLO X-Received: by 2002:a62:ac11:: with SMTP id v17mr51103193pfe.236.1560770148712; Mon, 17 Jun 2019 04:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560770148; cv=none; d=google.com; s=arc-20160816; b=Y9uWJF1WvO8Yr0NWLrla3Ig82HgBHxpUlWiEnUNyXlgxp96BibYU3FX7iXYzaHzaK0 XMEpz4GSlSd+bg7wGEQ+RoSjgIeSTsuHxoW+MqW989NKiZPRl/Ad6n4R6uot2Rdwag74 KNARAyyweN16DLDjMQO/hozmPX7qh8y4gycAFEcTRWfN2/wwK+ECWJbNTZCHgBrqkH4i JlWWodfwSpmQ7jiXYtMKoh+bRnOjZHNscSQh60hi7yeXxctx3EmiMry1nlWF1fPB/IbU VE8sUV04M9dzLt0WACuqp1kmiIT6t0HJbXSF6x6qhZqX5pwZp9Nnktw+pLJyVtVLyIRU NW2Q== 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=KWihs6LxhGRpYzWPEMB2rtZCchsDlc02NnuHQpFhCFs=; b=SEbZTgHLSZjkU3/d7TjDcogo6hDS95r1psfzJ/0lMyxy4Ciy47U/GAH+mD7SFxcy7/ BI4vxS31ioZBQVb/zNyZyQmBp1lBWBiQ+kiqXr3omDNyNh+8GLOxw69P+soZcuaSMs05 D/ld/rM6/1NQgCo8Xy9qt7DLXNNmCdjRrIP/dRZEFDOcflu6/7W9pvpogmDDYlLpFOkC ndi5uTGegfbvPdABYq+DcVdbFhEtzgkkq9NiXGaGnquBsuQ5e8Bv9JvQ9cv1oKOZIRst aYqYjIMal7rGVu5PtWUQoKAwD2iXwDlX/W9vy/Cap+gdYX5UagTT1gAe+PpCYtzCYR34 mktA== 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 h13si10392768pfk.196.2019.06.17.04.15.32; Mon, 17 Jun 2019 04:15:48 -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; 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 S1728046AbfFQLOM (ORCPT + 99 others); Mon, 17 Jun 2019 07:14:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56860 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727430AbfFQLOK (ORCPT ); Mon, 17 Jun 2019 07:14:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C5B730BB546; Mon, 17 Jun 2019 11:14:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BC8E59454; Mon, 17 Jun 2019 11:14:07 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4DCFE16E36; Mon, 17 Jun 2019 13:14:07 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , David Airlie , Daniel Vetter , virtualization@lists.linux-foundation.org (open list:VIRTIO GPU DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/4] drm/virtio: remove virtio_gpu_object_wait Date: Mon, 17 Jun 2019 13:14:06 +0200 Message-Id: <20190617111406.14765-5-kraxel@redhat.com> In-Reply-To: <20190617111406.14765-1-kraxel@redhat.com> References: <20190617111406.14765-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 17 Jun 2019 11:14:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No users left. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index 9e2d3062b01d..2cd96256ba37 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -364,7 +364,6 @@ int virtio_gpu_object_kmap(struct virtio_gpu_object *bo); int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev, struct virtio_gpu_object *bo); void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo); -int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait); /* virtgpu_prime.c */ struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 242766d644a7..82bfbf983fd2 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -233,16 +233,3 @@ void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo) kfree(bo->pages); bo->pages = NULL; } - -int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait) -{ - int r; - - r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL); - if (unlikely(r != 0)) - return r; - r = ttm_bo_wait(&bo->tbo, true, no_wait); - ttm_bo_unreserve(&bo->tbo); - return r; -} - -- 2.18.1