From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH 2/2] qxl: keep separate release_bo pointer Date: Wed, 18 Apr 2018 07:42:57 +0200 Message-ID: <20180418054257.15388-3-kraxel@redhat.com> References: <20180418054257.15388-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 (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF6E46E507 for ; Wed, 18 Apr 2018 05:43:02 +0000 (UTC) In-Reply-To: <20180418054257.15388-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 , Dave Airlie , Gerd Hoffmann , open list , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" List-Id: dri-devel@lists.freedesktop.org cXhsIGV4cGVjdHMgdGhhdCBsaXN0X2ZpcnN0X2VudHJ5KHJlbGVhc2UtPmJvcykgcmV0dXJucyB0 aGUgZmlyc3QKZWxlbWVudCBxeGwgYWRkZWQgdG8gdGhlIGxpc3QuICB0dG1fZXVfcmVzZXJ2ZV9i dWZmZXJzKCkgbWF5IHJlb3JkZXIKdGhlIGxpc3QgdGhvdWdoLgoKQWRkIGEgcmVsZWFzZV9ibyBm aWVsZCB0byBzdHJ1Y3QgcXhsX3JlbGVhc2UgYW5kIHVzZSB0aGF0IGluc3RlYWQuCgpTaWduZWQt b2ZmLWJ5OiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vcXhsL3F4bF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9j bWQuYyAgICAgfCAgNiArKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3JlbGVhc2UuYyB8 IDEyICsrKysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfZHJ2LmgKaW5kZXggMDBhMWE2NmIwNS4uODY0YjQ1NjA4 MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3F4bC9xeGxfZHJ2LmgKQEAgLTE2Nyw2ICsxNjcsNyBAQCBzdHJ1Y3QgcXhsX3Jl bGVhc2UgewogCiAJaW50IGlkOwogCWludCB0eXBlOworCXN0cnVjdCBxeGxfYm8gKnJlbGVhc2Vf Ym87CiAJdWludDMyX3QgcmVsZWFzZV9vZmZzZXQ7CiAJdWludDMyX3Qgc3VyZmFjZV9yZWxlYXNl X2lkOwogCXN0cnVjdCB3d19hY3F1aXJlX2N0eCB0aWNrZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vcXhsL3F4bF9jbWQuYyBiL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2NtZC5jCmlu ZGV4IGMwZmI1MmM2ZDQuLjAxNjY1Yjk4YzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9x eGwvcXhsX2NtZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2NtZC5jCkBAIC0xNzks MTAgKzE3OSw5IEBAIHF4bF9wdXNoX2NvbW1hbmRfcmluZ19yZWxlYXNlKHN0cnVjdCBxeGxfZGV2 aWNlICpxZGV2LCBzdHJ1Y3QgcXhsX3JlbGVhc2UgKnJlbGVhCiAJCQkgICAgICB1aW50MzJfdCB0 eXBlLCBib29sIGludGVycnVwdGlibGUpCiB7CiAJc3RydWN0IHF4bF9jb21tYW5kIGNtZDsKLQlz dHJ1Y3QgcXhsX2JvX2xpc3QgKmVudHJ5ID0gbGlzdF9maXJzdF9lbnRyeSgmcmVsZWFzZS0+Ym9z LCBzdHJ1Y3QgcXhsX2JvX2xpc3QsIHR2LmhlYWQpOwogCiAJY21kLnR5cGUgPSB0eXBlOwotCWNt ZC5kYXRhID0gcXhsX2JvX3BoeXNpY2FsX2FkZHJlc3MocWRldiwgdG9fcXhsX2JvKGVudHJ5LT50 di5ibyksIHJlbGVhc2UtPnJlbGVhc2Vfb2Zmc2V0KTsKKwljbWQuZGF0YSA9IHF4bF9ib19waHlz aWNhbF9hZGRyZXNzKHFkZXYsIHJlbGVhc2UtPnJlbGVhc2VfYm8sIHJlbGVhc2UtPnJlbGVhc2Vf b2Zmc2V0KTsKIAogCXJldHVybiBxeGxfcmluZ19wdXNoKHFkZXYtPmNvbW1hbmRfcmluZywgJmNt ZCwgaW50ZXJydXB0aWJsZSk7CiB9CkBAIC0xOTIsMTAgKzE5MSw5IEBAIHF4bF9wdXNoX2N1cnNv cl9yaW5nX3JlbGVhc2Uoc3RydWN0IHF4bF9kZXZpY2UgKnFkZXYsIHN0cnVjdCBxeGxfcmVsZWFz ZSAqcmVsZWFzCiAJCQkgICAgIHVpbnQzMl90IHR5cGUsIGJvb2wgaW50ZXJydXB0aWJsZSkKIHsK IAlzdHJ1Y3QgcXhsX2NvbW1hbmQgY21kOwotCXN0cnVjdCBxeGxfYm9fbGlzdCAqZW50cnkgPSBs aXN0X2ZpcnN0X2VudHJ5KCZyZWxlYXNlLT5ib3MsIHN0cnVjdCBxeGxfYm9fbGlzdCwgdHYuaGVh ZCk7CiAKIAljbWQudHlwZSA9IHR5cGU7Ci0JY21kLmRhdGEgPSBxeGxfYm9fcGh5c2ljYWxfYWRk cmVzcyhxZGV2LCB0b19xeGxfYm8oZW50cnktPnR2LmJvKSwgcmVsZWFzZS0+cmVsZWFzZV9vZmZz ZXQpOworCWNtZC5kYXRhID0gcXhsX2JvX3BoeXNpY2FsX2FkZHJlc3MocWRldiwgcmVsZWFzZS0+ cmVsZWFzZV9ibywgcmVsZWFzZS0+cmVsZWFzZV9vZmZzZXQpOwogCiAJcmV0dXJuIHF4bF9yaW5n X3B1c2gocWRldi0+Y3Vyc29yX3JpbmcsICZjbWQsIGludGVycnVwdGlibGUpOwogfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfcmVsZWFzZS5jIGIvZHJpdmVycy9ncHUvZHJt L3F4bC9xeGxfcmVsZWFzZS5jCmluZGV4IGEwYjQyNDRkMjguLjdjYjIxNDU3NzIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3JlbGVhc2UuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vcXhsL3F4bF9yZWxlYXNlLmMKQEAgLTE3Myw2ICsxNzMsNyBAQCBxeGxfcmVsZWFzZV9mcmVl X2xpc3Qoc3RydWN0IHF4bF9yZWxlYXNlICpyZWxlYXNlKQogCQlsaXN0X2RlbCgmZW50cnktPnR2 LmhlYWQpOwogCQlrZnJlZShlbnRyeSk7CiAJfQorCXJlbGVhc2UtPnJlbGVhc2VfYm8gPSBOVUxM OwogfQogCiB2b2lkCkBAIC0yOTYsNyArMjk3LDYgQEAgaW50IHF4bF9hbGxvY19zdXJmYWNlX3Jl bGVhc2VfcmVzZXJ2ZWQoc3RydWN0IHF4bF9kZXZpY2UgKnFkZXYsCiB7CiAJaWYgKHN1cmZhY2Vf Y21kX3R5cGUgPT0gUVhMX1NVUkZBQ0VfQ01EX0RFU1RST1kgJiYgY3JlYXRlX3JlbCkgewogCQlp bnQgaWRyX3JldDsKLQkJc3RydWN0IHF4bF9ib19saXN0ICplbnRyeSA9IGxpc3RfZmlyc3RfZW50 cnkoJmNyZWF0ZV9yZWwtPmJvcywgc3RydWN0IHF4bF9ib19saXN0LCB0di5oZWFkKTsKIAkJc3Ry dWN0IHF4bF9ibyAqYm87CiAJCXVuaW9uIHF4bF9yZWxlYXNlX2luZm8gKmluZm87CiAKQEAgLTMw NCw4ICszMDQsOSBAQCBpbnQgcXhsX2FsbG9jX3N1cmZhY2VfcmVsZWFzZV9yZXNlcnZlZChzdHJ1 Y3QgcXhsX2RldmljZSAqcWRldiwKIAkJaWRyX3JldCA9IHF4bF9yZWxlYXNlX2FsbG9jKHFkZXYs IFFYTF9SRUxFQVNFX1NVUkZBQ0VfQ01ELCByZWxlYXNlKTsKIAkJaWYgKGlkcl9yZXQgPCAwKQog CQkJcmV0dXJuIGlkcl9yZXQ7Ci0JCWJvID0gdG9fcXhsX2JvKGVudHJ5LT50di5ibyk7CisJCWJv ID0gY3JlYXRlX3JlbC0+cmVsZWFzZV9ibzsKIAorCQkoKnJlbGVhc2UpLT5yZWxlYXNlX2JvID0g Ym87CiAJCSgqcmVsZWFzZSktPnJlbGVhc2Vfb2Zmc2V0ID0gY3JlYXRlX3JlbC0+cmVsZWFzZV9v ZmZzZXQgKyA2NDsKIAogCQlxeGxfcmVsZWFzZV9saXN0X2FkZCgqcmVsZWFzZSwgYm8pOwpAQCAt MzY1LDYgKzM2Niw3IEBAIGludCBxeGxfYWxsb2NfcmVsZWFzZV9yZXNlcnZlZChzdHJ1Y3QgcXhs X2RldmljZSAqcWRldiwgdW5zaWduZWQgbG9uZyBzaXplLAogCiAJYm8gPSBxeGxfYm9fcmVmKHFk ZXYtPmN1cnJlbnRfcmVsZWFzZV9ib1tjdXJfaWR4XSk7CiAKKwkoKnJlbGVhc2UpLT5yZWxlYXNl X2JvID0gYm87CiAJKCpyZWxlYXNlKS0+cmVsZWFzZV9vZmZzZXQgPSBxZGV2LT5jdXJyZW50X3Jl bGVhc2VfYm9fb2Zmc2V0W2N1cl9pZHhdICogcmVsZWFzZV9zaXplX3Blcl9ib1tjdXJfaWR4XTsK IAlxZGV2LT5jdXJyZW50X3JlbGVhc2VfYm9fb2Zmc2V0W2N1cl9pZHhdKys7CiAKQEAgLTQwOCw4 ICs0MTAsNyBAQCB1bmlvbiBxeGxfcmVsZWFzZV9pbmZvICpxeGxfcmVsZWFzZV9tYXAoc3RydWN0 IHF4bF9kZXZpY2UgKnFkZXYsCiB7CiAJdm9pZCAqcHRyOwogCXVuaW9uIHF4bF9yZWxlYXNlX2lu Zm8gKmluZm87Ci0Jc3RydWN0IHF4bF9ib19saXN0ICplbnRyeSA9IGxpc3RfZmlyc3RfZW50cnko JnJlbGVhc2UtPmJvcywgc3RydWN0IHF4bF9ib19saXN0LCB0di5oZWFkKTsKLQlzdHJ1Y3QgcXhs X2JvICpibyA9IHRvX3F4bF9ibyhlbnRyeS0+dHYuYm8pOworCXN0cnVjdCBxeGxfYm8gKmJvID0g cmVsZWFzZS0+cmVsZWFzZV9ibzsKIAogCXB0ciA9IHF4bF9ib19rbWFwX2F0b21pY19wYWdlKHFk ZXYsIGJvLCByZWxlYXNlLT5yZWxlYXNlX29mZnNldCAmIFBBR0VfTUFTSyk7CiAJaWYgKCFwdHIp CkBAIC00MjIsOCArNDIzLDcgQEAgdm9pZCBxeGxfcmVsZWFzZV91bm1hcChzdHJ1Y3QgcXhsX2Rl dmljZSAqcWRldiwKIAkJICAgICAgIHN0cnVjdCBxeGxfcmVsZWFzZSAqcmVsZWFzZSwKIAkJICAg ICAgIHVuaW9uIHF4bF9yZWxlYXNlX2luZm8gKmluZm8pCiB7Ci0Jc3RydWN0IHF4bF9ib19saXN0 ICplbnRyeSA9IGxpc3RfZmlyc3RfZW50cnkoJnJlbGVhc2UtPmJvcywgc3RydWN0IHF4bF9ib19s aXN0LCB0di5oZWFkKTsKLQlzdHJ1Y3QgcXhsX2JvICpibyA9IHRvX3F4bF9ibyhlbnRyeS0+dHYu Ym8pOworCXN0cnVjdCBxeGxfYm8gKmJvID0gcmVsZWFzZS0+cmVsZWFzZV9ibzsKIAl2b2lkICpw dHI7CiAKIAlwdHIgPSAoKHZvaWQgKilpbmZvKSAtIChyZWxlYXNlLT5yZWxlYXNlX29mZnNldCAm IH5QQUdFX01BU0spOwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo=