From: Gerd Hoffmann Subject: [PATCH v3 06/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Date: Wed, 19 Jun 2019 11:04:14 +0200 Message-ID: <20190619090420.6667-7-kraxel@redhat.com> References: <20190619090420.6667-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id E70206E31A for ; Wed, 19 Jun 2019 09:04:25 +0000 (UTC) In-Reply-To: <20190619090420.6667-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , open list , Gerd Hoffmann , "open list:VIRTIO GPU DRIVER" List-Id: dri-devel@lists.freedesktop.org QWxsIGNhbGxlcnMgcGFzcyBub193YWl0ID0gZmFsc2UuCgpTaWduZWQtb2ZmLWJ5OiBHZXJkIEhv ZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlvL3Zp cnRncHVfZHJ2LmggICB8IDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9n ZW0uYyAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfaW9jdGwuYyB8 IDQgKystLQogMyBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oCmluZGV4IDJjZDk2MjU2YmEzNy4uMDZj YzBlOTYxZGY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oCkBAIC0zOTgsMTIg KzM5OCwxMSBAQCBzdGF0aWMgaW5saW5lIHU2NCB2aXJ0aW9fZ3B1X29iamVjdF9tbWFwX29mZnNl dChzdHJ1Y3QgdmlydGlvX2dwdV9vYmplY3QgKmJvKQogCXJldHVybiBkcm1fdm1hX25vZGVfb2Zm c2V0X2FkZHIoJmJvLT50Ym8udm1hX25vZGUpOwogfQogCi1zdGF0aWMgaW5saW5lIGludCB2aXJ0 aW9fZ3B1X29iamVjdF9yZXNlcnZlKHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCAqYm8sCi0JCQkJ CSBib29sIG5vX3dhaXQpCitzdGF0aWMgaW5saW5lIGludCB2aXJ0aW9fZ3B1X29iamVjdF9yZXNl cnZlKHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCAqYm8pCiB7CiAJaW50IHI7CiAKLQlyID0gdHRt X2JvX3Jlc2VydmUoJmJvLT50Ym8sIHRydWUsIG5vX3dhaXQsIE5VTEwpOworCXIgPSB0dG1fYm9f cmVzZXJ2ZSgmYm8tPnRibywgdHJ1ZSwgZmFsc2UsIE5VTEwpOwogCWlmICh1bmxpa2VseShyICE9 IDApKSB7CiAJCWlmIChyICE9IC1FUkVTVEFSVFNZUykgewogCQkJc3RydWN0IHZpcnRpb19ncHVf ZGV2aWNlICpxZGV2ID0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdw dV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9nZW0uYwppbmRleCAxZTQ5 ZTA4ZGQ1NDUuLjljOWFkM2IxNDA4MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRp by92aXJ0Z3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9nZW0u YwpAQCAtMTQwLDcgKzE0MCw3IEBAIGludCB2aXJ0aW9fZ3B1X2dlbV9vYmplY3Rfb3BlbihzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAlpZiAoIXZnZGV2LT5oYXNfdmlyZ2xfM2QpCiAJCXJl dHVybiAwOwogCi0JciA9IHZpcnRpb19ncHVfb2JqZWN0X3Jlc2VydmUocW9iaiwgZmFsc2UpOwor CXIgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmopOwogCWlmIChyKQogCQlyZXR1cm4g cjsKIApAQCAtMTYxLDcgKzE2MSw3IEBAIHZvaWQgdmlydGlvX2dwdV9nZW1fb2JqZWN0X2Nsb3Nl KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLAogCWlmICghdmdkZXYtPmhhc192aXJnbF8zZCkK IAkJcmV0dXJuOwogCi0JciA9IHZpcnRpb19ncHVfb2JqZWN0X3Jlc2VydmUocW9iaiwgZmFsc2Up OworCXIgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmopOwogCWlmIChyKQogCQlyZXR1 cm47CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5j IGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2lvY3RsLmMKaW5kZXggMzEzYzc3MGVh MmM1Li41Y2ZmZDJlNTRjMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmly dGdwdV9pb2N0bC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5j CkBAIC0zNzUsNyArMzc1LDcgQEAgc3RhdGljIGludCB2aXJ0aW9fZ3B1X3RyYW5zZmVyX2Zyb21f aG9zdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJcW9iaiA9IGdlbV90b192aXJ0 aW9fZ3B1X29iaihnb2JqKTsKIAotCXJldCA9IHZpcnRpb19ncHVfb2JqZWN0X3Jlc2VydmUocW9i aiwgZmFsc2UpOworCXJldCA9IHZpcnRpb19ncHVfb2JqZWN0X3Jlc2VydmUocW9iaik7CiAJaWYg KHJldCkKIAkJZ290byBvdXQ7CiAKQEAgLTQyNSw3ICs0MjUsNyBAQCBzdGF0aWMgaW50IHZpcnRp b19ncHVfdHJhbnNmZXJfdG9faG9zdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCiAJcW9iaiA9IGdlbV90b192aXJ0aW9fZ3B1X29iaihnb2JqKTsKIAotCXJldCA9 IHZpcnRpb19ncHVfb2JqZWN0X3Jlc2VydmUocW9iaiwgZmFsc2UpOworCXJldCA9IHZpcnRpb19n cHVfb2JqZWN0X3Jlc2VydmUocW9iaik7CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLS0gCjIu MTguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs