From: Ezequiel Garcia Subject: [PATCH 2/3] virtio: Rework virtio_gpu_object_kmap() Date: Tue, 25 Sep 2018 18:16:05 +0200 Message-ID: <20180925161606.17980-3-ezequiel@collabora.com> References: <20180925161606.17980-1-ezequiel@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id E705D6E3B6 for ; Tue, 25 Sep 2018 16:16:15 +0000 (UTC) In-Reply-To: <20180925161606.17980-1-ezequiel@collabora.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, virtualization@lists.linux-foundation.org Cc: David Airlie , Ezequiel Garcia , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org Q3VycmVudGx5LCB2aXJ0aW9fZ3B1X29iamVjdF9rbWFwKCkgaXMgb25seSBjYWxsZWQgYnkKdmly dGlvX2dwdWZiX2NyZWF0ZSgpLCB3aGVuIGEgRFJNIGZyYW1lYnVmZmVyIGlzIGNyZWF0ZWQuCgpU aHVzLCBpbnN0ZWFkIG9mIHJldHVybmluZyB0aGUgdm1hcCdlZCBhZGRyZXNzLCBlbWl0IGEgd2Fy bmluZwppZiB2aXJ0aW9fZ3B1X29iamVjdF9rbWFwIGlzIGNhbGxlZCBvbiBhbiBhbHJlYWR5IG1h cHBlZApvYmplY3QuIFdpdGggdGhpcyBjaGFuZ2UsIGttYXAva3VubWFwIGNhbGxzIGFyZSBub3cg YmFsYW5jZWQuCgpTaWduZWQtb2ZmLWJ5OiBFemVxdWllbCBHYXJjaWEgPGV6ZXF1aWVsQGNvbGxh Ym9yYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oICAgIHwg IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9mYi5jICAgICB8IDEwICsrLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9vYmplY3QuYyB8IDExICsrKy0t LS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oCmluZGV4IGE4YWY0NjU3MGEwMS4uOTdm MzY2ZjVkMmVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2Rydi5oCkBAIC0zNTcsNyAr MzU3LDcgQEAgaW50IHZpcnRpb19ncHVfb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgdmlydGlvX2dwdV9k ZXZpY2UgKnZnZGV2LAogCQkJICAgICB1bnNpZ25lZCBsb25nIHNpemUsIGJvb2wga2VybmVsLCBi b29sIHBpbm5lZCwKIAkJCSAgICAgc3RydWN0IHZpcnRpb19ncHVfb2JqZWN0ICoqYm9fcHRyKTsK IHZvaWQgdmlydGlvX2dwdV9vYmplY3Rfa3VubWFwKHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCAq Ym8pOwotaW50IHZpcnRpb19ncHVfb2JqZWN0X2ttYXAoc3RydWN0IHZpcnRpb19ncHVfb2JqZWN0 ICpibywgdm9pZCAqKnB0cik7CitpbnQgdmlydGlvX2dwdV9vYmplY3Rfa21hcChzdHJ1Y3Qgdmly dGlvX2dwdV9vYmplY3QgKmJvKTsKIGludCB2aXJ0aW9fZ3B1X29iamVjdF9nZXRfc2dfdGFibGUo c3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICpxZGV2LAogCQkJCSAgIHN0cnVjdCB2aXJ0aW9fZ3B1 X29iamVjdCAqYm8pOwogdm9pZCB2aXJ0aW9fZ3B1X29iamVjdF9mcmVlX3NnX3RhYmxlKHN0cnVj dCB2aXJ0aW9fZ3B1X29iamVjdCAqYm8pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Zp cnRpby92aXJ0Z3B1X2ZiLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZmIuYwpp bmRleCBiNWNlYmM5YTE3OWEuLjA4YWI0M2I5MTUwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3ZpcnRpby92aXJ0Z3B1X2ZiLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0 Z3B1X2ZiLmMKQEAgLTIxMCwxMiArMjEwLDYgQEAgc3RhdGljIHN0cnVjdCBmYl9vcHMgdmlydGlv X2dwdWZiX29wcyA9IHsKIAkuZmJfaW1hZ2VibGl0ID0gdmlydGlvX2dwdV8zZF9pbWFnZWJsaXQs CiB9OwogCi1zdGF0aWMgaW50IHZpcnRpb19ncHVfdm1hcF9mYihzdHJ1Y3QgdmlydGlvX2dwdV9k ZXZpY2UgKnZnZGV2LAotCQkJICAgICAgc3RydWN0IHZpcnRpb19ncHVfb2JqZWN0ICpvYmopCi17 Ci0JcmV0dXJuIHZpcnRpb19ncHVfb2JqZWN0X2ttYXAob2JqLCBOVUxMKTsKLX0KLQogc3RhdGlj IGludCB2aXJ0aW9fZ3B1ZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJ CQkgICAgICAgc3RydWN0IGRybV9mYl9oZWxwZXJfc3VyZmFjZV9zaXplICpzaXplcykKIHsKQEAg LTI0OCw5ICsyNDIsOSBAQCBzdGF0aWMgaW50IHZpcnRpb19ncHVmYl9jcmVhdGUoc3RydWN0IGRy bV9mYl9oZWxwZXIgKmhlbHBlciwKIAl2aXJ0aW9fZ3B1X2NtZF9jcmVhdGVfcmVzb3VyY2Uodmdk ZXYsIHJlc2lkLCBmb3JtYXQsCiAJCQkJICAgICAgIG1vZGVfY21kLndpZHRoLCBtb2RlX2NtZC5o ZWlnaHQpOwogCi0JcmV0ID0gdmlydGlvX2dwdV92bWFwX2ZiKHZnZGV2LCBvYmopOworCXJldCA9 IHZpcnRpb19ncHVfb2JqZWN0X2ttYXAob2JqKTsKIAlpZiAocmV0KSB7Ci0JCURSTV9FUlJPUigi ZmFpbGVkIHRvIHZtYXAgZmIgJWRcbiIsIHJldCk7CisJCURSTV9FUlJPUigiZmFpbGVkIHRvIGtt YXAgZmIgJWRcbiIsIHJldCk7CiAJCWdvdG8gZXJyX29ial92bWFwOwogCX0KIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X29iamVjdC5jIGIvZHJpdmVycy9ncHUv ZHJtL3ZpcnRpby92aXJ0Z3B1X29iamVjdC5jCmluZGV4IDExM2VhZTAwZDI5My4uZWNhNzY1NTM3 NDcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfb2JqZWN0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X29iamVjdC5jCkBAIC0xMDcsMjIg KzEwNywxNyBAQCB2b2lkIHZpcnRpb19ncHVfb2JqZWN0X2t1bm1hcChzdHJ1Y3QgdmlydGlvX2dw dV9vYmplY3QgKmJvKQogCXR0bV9ib19rdW5tYXAoJmJvLT5rbWFwKTsKIH0KIAotaW50IHZpcnRp b19ncHVfb2JqZWN0X2ttYXAoc3RydWN0IHZpcnRpb19ncHVfb2JqZWN0ICpibywgdm9pZCAqKnB0 cikKK2ludCB2aXJ0aW9fZ3B1X29iamVjdF9rbWFwKHN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCAq Ym8pCiB7CiAJYm9vbCBpc19pb21lbTsKIAlpbnQgcjsKIAotCWlmIChiby0+dm1hcCkgewotCQlp ZiAocHRyKQotCQkJKnB0ciA9IGJvLT52bWFwOwotCQlyZXR1cm4gMDsKLQl9CisJV0FSTl9PTihi by0+dm1hcCk7CisKIAlyID0gdHRtX2JvX2ttYXAoJmJvLT50Ym8sIDAsIGJvLT50Ym8ubnVtX3Bh Z2VzLCAmYm8tPmttYXApOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAliby0+dm1hcCA9IHR0bV9r bWFwX29ial92aXJ0dWFsKCZiby0+a21hcCwgJmlzX2lvbWVtKTsKLQlpZiAocHRyKQotCQkqcHRy ID0gYm8tPnZtYXA7CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMTkuMC5yYzIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=