From: Gerd Hoffmann Subject: [PATCH v4 05/12] drm/virtio: drop no_wait argument from virtio_gpu_object_reserve Date: Thu, 20 Jun 2019 08:07:19 +0200 Message-ID: <20190620060726.926-6-kraxel@redhat.com> References: <20190620060726.926-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 EB0406E4C9 for ; Thu, 20 Jun 2019 06:07:37 +0000 (UTC) In-Reply-To: <20190620060726.926-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 ZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRh bmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1 X2Rydi5oICAgfCA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2VtLmMg ICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2lvY3RsLmMgfCA0ICsr LS0KIDMgZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaAppbmRleCAyY2Q5NjI1NmJhMzcuLjA2Y2MwZTk2 MWRmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYuaApAQCAtMzk4LDEyICszOTgs MTEgQEAgc3RhdGljIGlubGluZSB1NjQgdmlydGlvX2dwdV9vYmplY3RfbW1hcF9vZmZzZXQoc3Ry dWN0IHZpcnRpb19ncHVfb2JqZWN0ICpibykKIAlyZXR1cm4gZHJtX3ZtYV9ub2RlX29mZnNldF9h ZGRyKCZiby0+dGJvLnZtYV9ub2RlKTsKIH0KIAotc3RhdGljIGlubGluZSBpbnQgdmlydGlvX2dw dV9vYmplY3RfcmVzZXJ2ZShzdHJ1Y3QgdmlydGlvX2dwdV9vYmplY3QgKmJvLAotCQkJCQkgYm9v bCBub193YWl0KQorc3RhdGljIGlubGluZSBpbnQgdmlydGlvX2dwdV9vYmplY3RfcmVzZXJ2ZShz dHJ1Y3QgdmlydGlvX2dwdV9vYmplY3QgKmJvKQogewogCWludCByOwogCi0JciA9IHR0bV9ib19y ZXNlcnZlKCZiby0+dGJvLCB0cnVlLCBub193YWl0LCBOVUxMKTsKKwlyID0gdHRtX2JvX3Jlc2Vy dmUoJmJvLT50Ym8sIHRydWUsIGZhbHNlLCBOVUxMKTsKIAlpZiAodW5saWtlbHkociAhPSAwKSkg ewogCQlpZiAociAhPSAtRVJFU1RBUlRTWVMpIHsKIAkJCXN0cnVjdCB2aXJ0aW9fZ3B1X2Rldmlj ZSAqcWRldiA9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2VtLmMKaW5kZXggMWU0OWUwOGRk NTQ1Li45YzlhZDNiMTQwODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmly dGdwdV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2VtLmMKQEAg LTE0MCw3ICsxNDAsNyBAQCBpbnQgdmlydGlvX2dwdV9nZW1fb2JqZWN0X29wZW4oc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKCF2Z2Rldi0+aGFzX3ZpcmdsXzNkKQogCQlyZXR1cm4g MDsKIAotCXIgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmosIGZhbHNlKTsKKwlyID0g dmlydGlvX2dwdV9vYmplY3RfcmVzZXJ2ZShxb2JqKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAK QEAgLTE2MSw3ICsxNjEsNyBAQCB2b2lkIHZpcnRpb19ncHVfZ2VtX29iamVjdF9jbG9zZShzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAlpZiAoIXZnZGV2LT5oYXNfdmlyZ2xfM2QpCiAJCXJl dHVybjsKIAotCXIgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmosIGZhbHNlKTsKKwly ID0gdmlydGlvX2dwdV9vYmplY3RfcmVzZXJ2ZShxb2JqKTsKIAlpZiAocikKIAkJcmV0dXJuOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfaW9jdGwuYyBiL2Ry aXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5jCmluZGV4IDMxM2M3NzBlYTJjNS4u NWNmZmQyZTU0YzA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVf aW9jdGwuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfaW9jdGwuYwpAQCAt Mzc1LDcgKzM3NSw3IEBAIHN0YXRpYyBpbnQgdmlydGlvX2dwdV90cmFuc2Zlcl9mcm9tX2hvc3Rf aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCXFvYmogPSBnZW1fdG9fdmlydGlvX2dw dV9vYmooZ29iaik7CiAKLQlyZXQgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmosIGZh bHNlKTsKKwlyZXQgPSB2aXJ0aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmopOwogCWlmIChyZXQp CiAJCWdvdG8gb3V0OwogCkBAIC00MjUsNyArNDI1LDcgQEAgc3RhdGljIGludCB2aXJ0aW9fZ3B1 X3RyYW5zZmVyX3RvX2hvc3RfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAogCXFvYmogPSBnZW1fdG9fdmlydGlvX2dwdV9vYmooZ29iaik7CiAKLQlyZXQgPSB2aXJ0 aW9fZ3B1X29iamVjdF9yZXNlcnZlKHFvYmosIGZhbHNlKTsKKwlyZXQgPSB2aXJ0aW9fZ3B1X29i amVjdF9yZXNlcnZlKHFvYmopOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0tIAoyLjE4LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==