From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH 6/8] drm/virtio: fix resource id handling Date: Mon, 1 Oct 2018 12:32:20 +0200 Message-ID: <20181001103222.11924-7-kraxel@redhat.com> References: <20181001103222.11924-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 3783A6E118 for ; Mon, 1 Oct 2018 10:32:30 +0000 (UTC) In-Reply-To: <20181001103222.11924-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 TW92ZSB2aXJ0aW9fZ3B1X3Jlc291cmNlX2lkX3tnZXQscHV0fSB0byB2aXJ0Z3B1X29iamVjdC5j IGFuZCBtYWtlIHRoZW0Kc3RhdGljLiAgQWxsb2NhdGUgYW5kIGZyZWUgdGhlIGlkIG9uIGNyZWF0 aW9uIGFuZCBkZXN0cm95LCBkcm9wIGFsbApvdGhlciBjYWxscy4gIFRoYXQgd2F5IG9iamVjdHMg aGF2ZSBhIHZhbGlkIGhhbmRsZSBmb3IgdGhlIHdob2xlCmxpZmV0aW1lIG9mIHRoZSBvYmplY3Qu CgpBbHNvIGZpeGVzIGlkcyBsZWFraW5nLiAgV29yc3Qgb2ZmZW5kZXIgYXJlIGR1bWIgYnVmZmVy cywgYW5kIEkgdGhpbmsKc29tZSBlcnJvciBwYXRocyB0b28uCgpTaWduZWQtb2ZmLWJ5OiBHZXJk IEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlv L3ZpcnRncHVfZHJ2LmggICAgfCAgMyAtLS0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdw dV9mYi5jICAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9nZW0uYyAg ICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5jICB8ICAxIC0K IGRyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9vYmplY3QuYyB8IDIzICsrKysrKysrKysr KysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYyAgICAgfCAy MCAtLS0tLS0tLS0tLS0tLS0tLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCsp LCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3Zp cnRncHVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZHJ2LmgKaW5kZXgg NGEzOTg3N2NlNi4uMWMzMjFlNDg0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRp by92aXJ0Z3B1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9kcnYu aApAQCAtMjYwLDkgKzI2MCw2IEBAIGludCB2aXJ0aW9fZ3B1X3N1cmZhY2VfZGlydHkoc3RydWN0 IHZpcnRpb19ncHVfZnJhbWVidWZmZXIgKnFmYiwKIC8qIHZpcnRpbyB2ZyAqLwogaW50IHZpcnRp b19ncHVfYWxsb2NfdmJ1ZnMoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNlICp2Z2Rldik7CiB2b2lk IHZpcnRpb19ncHVfZnJlZV92YnVmcyhzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2KTsK LXZvaWQgdmlydGlvX2dwdV9yZXNvdXJjZV9pZF9nZXQoc3RydWN0IHZpcnRpb19ncHVfZGV2aWNl ICp2Z2RldiwKLQkJCSAgICAgICB1aW50MzJfdCAqcmVzaWQpOwotdm9pZCB2aXJ0aW9fZ3B1X3Jl c291cmNlX2lkX3B1dChzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2LCB1aW50MzJfdCBp ZCk7CiB2b2lkIHZpcnRpb19ncHVfY21kX2NyZWF0ZV9yZXNvdXJjZShzdHJ1Y3QgdmlydGlvX2dw dV9kZXZpY2UgKnZnZGV2LAogCQkJCSAgICBzdHJ1Y3QgdmlydGlvX2dwdV9vYmplY3QgKmJvLAog CQkJCSAgICB1aW50MzJfdCBmb3JtYXQsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmly dGlvL3ZpcnRncHVfZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9mYi5jCmlu ZGV4IGMyMmE4MjQ2YjYuLmZiMWNjOGIyZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92 aXJ0aW8vdmlydGdwdV9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9m Yi5jCkBAIC0yMzEsNyArMjMxLDYgQEAgc3RhdGljIGludCB2aXJ0aW9fZ3B1ZmJfY3JlYXRlKHN0 cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJaWYgKElTX0VSUihvYmopKQogCQlyZXR1cm4g UFRSX0VSUihvYmopOwogCi0JdmlydGlvX2dwdV9yZXNvdXJjZV9pZF9nZXQodmdkZXYsICZvYmot Pmh3X3Jlc19oYW5kbGUpOwogCXZpcnRpb19ncHVfY21kX2NyZWF0ZV9yZXNvdXJjZSh2Z2Rldiwg b2JqLCBmb3JtYXQsCiAJCQkJICAgICAgIG1vZGVfY21kLndpZHRoLCBtb2RlX2NtZC5oZWlnaHQp OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfZ2VtLmMKaW5kZXggNjY1ZDE4YTQ5ZC4uZjA2 NTg2MzkzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X2dlbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9nZW0uYwpAQCAtMTAzLDcgKzEw Myw2IEBAIGludCB2aXJ0aW9fZ3B1X21vZGVfZHVtYl9jcmVhdGUoc3RydWN0IGRybV9maWxlICpm aWxlX3ByaXYsCiAKIAlmb3JtYXQgPSB2aXJ0aW9fZ3B1X3RyYW5zbGF0ZV9mb3JtYXQoRFJNX0ZP Uk1BVF9IT1NUX1hSR0I4ODg4KTsKIAlvYmogPSBnZW1fdG9fdmlydGlvX2dwdV9vYmooZ29iaik7 Ci0JdmlydGlvX2dwdV9yZXNvdXJjZV9pZF9nZXQodmdkZXYsICZvYmotPmh3X3Jlc19oYW5kbGUp OwogCXZpcnRpb19ncHVfY21kX2NyZWF0ZV9yZXNvdXJjZSh2Z2Rldiwgb2JqLCBmb3JtYXQsCiAJ CQkJICAgICAgIGFyZ3MtPndpZHRoLCBhcmdzLT5oZWlnaHQpOwogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfaW9jdGwuYyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0 aW8vdmlydGdwdV9pb2N0bC5jCmluZGV4IGY5YzU1ZWNmY2EuLjY4MWVkZDljOTIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS92aXJ0aW8vdmlydGdwdV9pb2N0bC5jCkBAIC0yNTMsNyArMjUzLDYgQEAgc3RhdGlj IGludCB2aXJ0aW9fZ3B1X3Jlc291cmNlX2NyZWF0ZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAogCWlmIChJU19FUlIocW9iaikpCiAJCXJldHVybiBQVFJfRVJSKHFv YmopOwogCW9iaiA9ICZxb2JqLT5nZW1fYmFzZTsKLQl2aXJ0aW9fZ3B1X3Jlc291cmNlX2lkX2dl dCh2Z2RldiwgJnFvYmotPmh3X3Jlc19oYW5kbGUpOwogCiAJaWYgKCF2Z2Rldi0+aGFzX3Zpcmds XzNkKSB7CiAJCXZpcnRpb19ncHVfY21kX2NyZWF0ZV9yZXNvdXJjZSh2Z2RldiwgcW9iaiwgcmMt PmZvcm1hdCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9vYmpl Y3QuYyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0aW8vdmlydGdwdV9vYmplY3QuYwppbmRleCA2NjEx YzQ4N2Q3Li44YmQxZWJlMTNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3Zp cnRncHVfb2JqZWN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X29iamVj dC5jCkBAIC0yNSw2ICsyNSwyNiBAQAogCiAjaW5jbHVkZSAidmlydGdwdV9kcnYuaCIKIAorc3Rh dGljIHZvaWQgdmlydGlvX2dwdV9yZXNvdXJjZV9pZF9nZXQoc3RydWN0IHZpcnRpb19ncHVfZGV2 aWNlICp2Z2RldiwKKwkJCQkgICAgICAgdWludDMyX3QgKnJlc2lkKQoreworCWludCBoYW5kbGU7 CisKKwlpZHJfcHJlbG9hZChHRlBfS0VSTkVMKTsKKwlzcGluX2xvY2soJnZnZGV2LT5yZXNvdXJj ZV9pZHJfbG9jayk7CisJaGFuZGxlID0gaWRyX2FsbG9jKCZ2Z2Rldi0+cmVzb3VyY2VfaWRyLCBO VUxMLCAxLCAwLCBHRlBfTk9XQUlUKTsKKwlzcGluX3VubG9jaygmdmdkZXYtPnJlc291cmNlX2lk cl9sb2NrKTsKKwlpZHJfcHJlbG9hZF9lbmQoKTsKKwkqcmVzaWQgPSBoYW5kbGU7Cit9CisKK3N0 YXRpYyB2b2lkIHZpcnRpb19ncHVfcmVzb3VyY2VfaWRfcHV0KHN0cnVjdCB2aXJ0aW9fZ3B1X2Rl dmljZSAqdmdkZXYsIHVpbnQzMl90IGlkKQoreworCXNwaW5fbG9jaygmdmdkZXYtPnJlc291cmNl X2lkcl9sb2NrKTsKKwlpZHJfcmVtb3ZlKCZ2Z2Rldi0+cmVzb3VyY2VfaWRyLCBpZCk7CisJc3Bp bl91bmxvY2soJnZnZGV2LT5yZXNvdXJjZV9pZHJfbG9jayk7Cit9CisKIHN0YXRpYyB2b2lkIHZp cnRpb19ncHVfdHRtX2JvX2Rlc3Ryb3koc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICp0Ym8pCiB7 CiAJc3RydWN0IHZpcnRpb19ncHVfb2JqZWN0ICpibzsKQEAgLTQwLDYgKzYwLDcgQEAgc3RhdGlj IHZvaWQgdmlydGlvX2dwdV90dG1fYm9fZGVzdHJveShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3Qg KnRibykKIAlpZiAoYm8tPnZtYXApCiAJCXZpcnRpb19ncHVfb2JqZWN0X2t1bm1hcChibyk7CiAJ ZHJtX2dlbV9vYmplY3RfcmVsZWFzZSgmYm8tPmdlbV9iYXNlKTsKKwl2aXJ0aW9fZ3B1X3Jlc291 cmNlX2lkX3B1dCh2Z2RldiwgYm8tPmh3X3Jlc19oYW5kbGUpOwogCWtmcmVlKGJvKTsKIH0KIApA QCAtODEsOSArMTAyLDExIEBAIGludCB2aXJ0aW9fZ3B1X29iamVjdF9jcmVhdGUoc3RydWN0IHZp cnRpb19ncHVfZGV2aWNlICp2Z2RldiwKIAlibyA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCB2aXJ0 aW9fZ3B1X29iamVjdCksIEdGUF9LRVJORUwpOwogCWlmIChibyA9PSBOVUxMKQogCQlyZXR1cm4g LUVOT01FTTsKKwl2aXJ0aW9fZ3B1X3Jlc291cmNlX2lkX2dldCh2Z2RldiwgJmJvLT5od19yZXNf aGFuZGxlKTsKIAlzaXplID0gcm91bmR1cChzaXplLCBQQUdFX1NJWkUpOwogCXJldCA9IGRybV9n ZW1fb2JqZWN0X2luaXQodmdkZXYtPmRkZXYsICZiby0+Z2VtX2Jhc2UsIHNpemUpOwogCWlmIChy ZXQgIT0gMCkgeworCQl2aXJ0aW9fZ3B1X3Jlc291cmNlX2lkX3B1dCh2Z2RldiwgYm8tPmh3X3Jl c19oYW5kbGUpOwogCQlrZnJlZShibyk7CiAJCXJldHVybiByZXQ7CiAJfQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X3ZxLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmly dGlvL3ZpcnRncHVfdnEuYwppbmRleCA0NWRhM2M4N2I2Li5mNmU4NzVjZGNkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdnEuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vdmlydGlvL3ZpcnRncHVfdnEuYwpAQCAtMzgsMjYgKzM4LDYgQEAKIAkJCSAgICAgICArIE1B WF9JTkxJTkVfQ01EX1NJWkUJCSBcCiAJCQkgICAgICAgKyBNQVhfSU5MSU5FX1JFU1BfU0laRSkK IAotdm9pZCB2aXJ0aW9fZ3B1X3Jlc291cmNlX2lkX2dldChzdHJ1Y3QgdmlydGlvX2dwdV9kZXZp Y2UgKnZnZGV2LAotCQkJCXVpbnQzMl90ICpyZXNpZCkKLXsKLQlpbnQgaGFuZGxlOwotCi0JaWRy X3ByZWxvYWQoR0ZQX0tFUk5FTCk7Ci0Jc3Bpbl9sb2NrKCZ2Z2Rldi0+cmVzb3VyY2VfaWRyX2xv Y2spOwotCWhhbmRsZSA9IGlkcl9hbGxvYygmdmdkZXYtPnJlc291cmNlX2lkciwgTlVMTCwgMSwg MCwgR0ZQX05PV0FJVCk7Ci0Jc3Bpbl91bmxvY2soJnZnZGV2LT5yZXNvdXJjZV9pZHJfbG9jayk7 Ci0JaWRyX3ByZWxvYWRfZW5kKCk7Ci0JKnJlc2lkID0gaGFuZGxlOwotfQotCi12b2lkIHZpcnRp b19ncHVfcmVzb3VyY2VfaWRfcHV0KHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAqdmdkZXYsIHVp bnQzMl90IGlkKQotewotCXNwaW5fbG9jaygmdmdkZXYtPnJlc291cmNlX2lkcl9sb2NrKTsKLQlp ZHJfcmVtb3ZlKCZ2Z2Rldi0+cmVzb3VyY2VfaWRyLCBpZCk7Ci0Jc3Bpbl91bmxvY2soJnZnZGV2 LT5yZXNvdXJjZV9pZHJfbG9jayk7Ci19Ci0KIHZvaWQgdmlydGlvX2dwdV9jdHJsX2FjayhzdHJ1 Y3QgdmlydHF1ZXVlICp2cSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdnEtPnZkZXYt PnByaXY7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==