From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Chris Wilson Date: Mon, 23 Jul 2018 12:29:47 +0100 Message-Id: <20180723112947.5003-1-chris@chris-wilson.co.uk> Subject: [igt-dev] [PATCH i-g-t] igt/gem_tiled_fence_blits: Remove libdrm_intel dependence List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org List-ID: TW9kZXJuaXNlIHRoZSB0ZXN0IHRvIHVzZSBpZ3QncyBpb2N0bCBsaWJyYXJ5IGFzIG9wcG9zZWQg dG8gdGhlCmFudGlxdWF0ZWQgbGliZHJtX2ludGVsLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogdGVzdHMvZ2VtX3RpbGVkX2ZlbmNl X2JsaXRzLmMgfCAxODggKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDExMCBpbnNlcnRpb25zKCspLCA3OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS90ZXN0cy9nZW1fdGlsZWRfZmVuY2VfYmxpdHMuYyBiL3Rlc3RzL2dlbV90aWxlZF9mZW5jZV9i bGl0cy5jCmluZGV4IDY5M2U5NmNlYy4uOTc0NzYyZDQ0IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1f dGlsZWRfZmVuY2VfYmxpdHMuYworKysgYi90ZXN0cy9nZW1fdGlsZWRfZmVuY2VfYmxpdHMuYwpA QCAtNDIsNTQgKzQyLDM4IEBACiAgKi8KIAogI2luY2x1ZGUgImlndC5oIgotI2luY2x1ZGUgPHN0 ZGxpYi5oPgotI2luY2x1ZGUgPHN0ZGlvLmg+Ci0jaW5jbHVkZSA8c3RyaW5nLmg+Ci0jaW5jbHVk ZSA8ZmNudGwuaD4KLSNpbmNsdWRlIDxpbnR0eXBlcy5oPgotI2luY2x1ZGUgPGVycm5vLmg+Ci0j aW5jbHVkZSA8c3lzL3N0YXQuaD4KLSNpbmNsdWRlIDxzeXMvdGltZS5oPgotCi0jaW5jbHVkZSA8 ZHJtLmg+Ci0KLSNpbmNsdWRlICJpbnRlbF9idWZtZ3IuaCIKLQotc3RhdGljIGRybV9pbnRlbF9i dWZtZ3IgKmJ1Zm1ncjsKLXN0cnVjdCBpbnRlbF9iYXRjaGJ1ZmZlciAqYmF0Y2g7Ci1lbnVtIHt3 aWR0aD01MTIsIGhlaWdodD01MTJ9Owotc3RhdGljIGNvbnN0IGludCBib19zaXplID0gd2lkdGgg KiBoZWlnaHQgKiA0OworI2luY2x1ZGUgImlndF94ODYuaCIKKworZW51bSB7IHdpZHRoID0gNTEy LCBoZWlnaHQgPSA1MTIgfTsKIHN0YXRpYyB1aW50MzJfdCBsaW5lYXJbd2lkdGggKiBoZWlnaHRd Oworc3RhdGljIGNvbnN0IGludCBib19zaXplID0gc2l6ZW9mKGxpbmVhcik7CiAKLXN0YXRpYyBk cm1faW50ZWxfYm8gKgotY3JlYXRlX2JvKGludCBmZCwgdWludDMyX3Qgc3RhcnRfdmFsKQorc3Rh dGljIHVpbnQzMl90IGNyZWF0ZV9ibyhpbnQgZmQsIHVpbnQzMl90IHN0YXJ0X3ZhbCkKIHsKLQlk cm1faW50ZWxfYm8gKmJvOwotCXVpbnQzMl90IHRpbGluZyA9IEk5MTVfVElMSU5HX1g7Ci0JaW50 IHJldCwgaTsKKwl1aW50MzJfdCBoYW5kbGU7CisJdWludDMyX3QgKnB0cjsKIAotCWJvID0gZHJt X2ludGVsX2JvX2FsbG9jKGJ1Zm1nciwgInRpbGVkIGJvIiwgYm9fc2l6ZSwgNDA5Nik7Ci0JcmV0 ID0gZHJtX2ludGVsX2JvX3NldF90aWxpbmcoYm8sICZ0aWxpbmcsIHdpZHRoICogNCk7Ci0JaWd0 X2Fzc2VydF9lcShyZXQsIDApOwotCWlndF9hc3NlcnQodGlsaW5nID09IEk5MTVfVElMSU5HX1gp OworCWhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIGJvX3NpemUpOworCWdlbV9zZXRfdGlsaW5nKGZk LCBoYW5kbGUsIEk5MTVfVElMSU5HX1gsIHdpZHRoICogNCk7CiAKIAkvKiBGaWxsIHRoZSBCTyB3 aXRoIGR3b3JkcyBzdGFydGluZyBhdCBzdGFydF92YWwgKi8KLQlmb3IgKGkgPSAwOyBpIDwgd2lk dGggKiBoZWlnaHQ7IGkrKykKLQkJbGluZWFyW2ldID0gc3RhcnRfdmFsKys7Ci0KLQlnZW1fd3Jp dGUoZmQsIGJvLT5oYW5kbGUsIDAsIGxpbmVhciwgc2l6ZW9mKGxpbmVhcikpOworCXB0ciA9IGdl bV9tbWFwX19ndHQoZmQsIGhhbmRsZSwgYm9fc2l6ZSwgUFJPVF9XUklURSk7CisJZm9yIChpbnQg aSA9IDA7IGkgPCB3aWR0aCAqIGhlaWdodDsgaSsrKQorCQlwdHJbaV0gPSBzdGFydF92YWwrKzsK KwltdW5tYXAocHRyLCBib19zaXplKTsKIAotCXJldHVybiBibzsKKwlyZXR1cm4gaGFuZGxlOwog fQogCi1zdGF0aWMgdm9pZAotY2hlY2tfYm8oaW50IGZkLCBkcm1faW50ZWxfYm8gKmJvLCB1aW50 MzJfdCBzdGFydF92YWwpCitzdGF0aWMgdm9pZCBjaGVja19ibyhpbnQgZmQsIHVpbnQzMl90IGhh bmRsZSwgdWludDMyX3Qgc3RhcnRfdmFsKQogewotCWludCBpOworCXVpbnQzMl90ICpwdHI7CiAK LQlnZW1fcmVhZChmZCwgYm8tPmhhbmRsZSwgMCwgbGluZWFyLCBzaXplb2YobGluZWFyKSk7CisJ cHRyID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlLCBib19zaXplLCBQUk9UX1JFQUQpOworCWln dF9tZW1jcHlfZnJvbV93YyhsaW5lYXIsIHB0ciwgYm9fc2l6ZSk7CisJbXVubWFwKHB0ciwgYm9f c2l6ZSk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgd2lkdGggKiBoZWlnaHQ7IGkrKykgeworCWZvciAo aW50IGkgPSAwOyBpIDwgd2lkdGggKiBoZWlnaHQ7IGkrKykgewogCQlpZ3RfYXNzZXJ0X2YobGlu ZWFyW2ldID09IHN0YXJ0X3ZhbCwKIAkJCSAgICAgIkV4cGVjdGVkIDB4JTA4eCwgZm91bmQgMHgl MDh4ICIKIAkJCSAgICAgImF0IG9mZnNldCAweCUwOHhcbiIsCkBAIC05OCw3MyArODIsMTIyIEBA IGNoZWNrX2JvKGludCBmZCwgZHJtX2ludGVsX2JvICpibywgdWludDMyX3Qgc3RhcnRfdmFsKQog CX0KIH0KIAorc3RhdGljIHVpbnQzMl90CitjcmVhdGVfYmF0Y2goaW50IGZkLCBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlbG9jYXRpb25fZW50cnkgKnJlbG9jKQoreworCWNvbnN0IGludCBnZW4gPSBp bnRlbF9nZW4oaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkpOworCWNvbnN0IGJvb2wgaGFzXzY0Yl9y ZWxvYyA9IGdlbiA+PSA4OworCXVpbnQzMl90ICpiYXRjaDsKKwl1aW50MzJfdCBoYW5kbGU7CisJ dWludDMyX3QgcGl0Y2g7CisJaW50IGkgPSAwOworCisJaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwg NDA5Nik7CisJYmF0Y2ggPSBnZW1fbW1hcF9fY3B1KGZkLCBoYW5kbGUsIDAsIDQwOTYsIFBST1Rf V1JJVEUpOworCisJYmF0Y2hbaV0gPSAoWFlfU1JDX0NPUFlfQkxUX0NNRCB8CisJCSAgICBYWV9T UkNfQ09QWV9CTFRfV1JJVEVfQUxQSEEgfAorCQkgICAgWFlfU1JDX0NPUFlfQkxUX1dSSVRFX1JH Qik7CisJaWYgKGdlbiA+PSA0KSB7CisJCWJhdGNoW2ldIHw9IChYWV9TUkNfQ09QWV9CTFRfU1JD X1RJTEVEIHwKKwkJCSAgICAgWFlfU1JDX0NPUFlfQkxUX0RTVF9USUxFRCk7CisJCXBpdGNoID0g d2lkdGg7CisJfSBlbHNlIHsKKwkJcGl0Y2ggPSA0ICogd2lkdGg7CisJfQorCWJhdGNoW2krK10g fD0gNiArIDIgKiBoYXNfNjRiX3JlbG9jOworCisJYmF0Y2hbaSsrXSA9IDMgPDwgMjQgfCAweGNj IDw8IDE2IHwgcGl0Y2g7CisJYmF0Y2hbaSsrXSA9IDA7IC8qIGRzdCAoeDEsIHkxKSAqLworCWJh dGNoW2krK10gPSBoZWlnaHQgPDwgMTYgfCB3aWR0aDsgLyogZHN0ICh4MiB5MikgKi8KKwlyZWxv Y1swXS5vZmZzZXQgPSBzaXplb2YoKmJhdGNoKSAqIGk7CisJcmVsb2NbMF0ucmVhZF9kb21haW5z ID0gSTkxNV9HRU1fRE9NQUlOX1JFTkRFUjsKKwlyZWxvY1swXS53cml0ZV9kb21haW4gPSBJOTE1 X0dFTV9ET01BSU5fUkVOREVSOworCWJhdGNoW2krK10gPSAwOworCWlmIChoYXNfNjRiX3JlbG9j KQorCQliYXRjaFtpKytdID0gMDsKKworCWJhdGNoW2krK10gPSAwOyAvKiBzcmMgKHgxLCB5MSkg Ki8KKwliYXRjaFtpKytdID0gcGl0Y2g7CisJcmVsb2NbMV0ub2Zmc2V0ID0gc2l6ZW9mKCpiYXRj aCkgKiBpOworCXJlbG9jWzFdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9SRU5ERVI7 CisJYmF0Y2hbaSsrXSA9IDA7CisJaWYgKGhhc182NGJfcmVsb2MpCisJCWJhdGNoW2krK10gPSAw OworCisJYmF0Y2hbaSsrXSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7CisJbXVubWFwKGJhdGNoLCA0 MDk2KTsKKworCXJldHVybiBoYW5kbGU7Cit9CisKIHN0YXRpYyB2b2lkIHJ1bl90ZXN0KGludCBm ZCwgaW50IGNvdW50KQogewotCWRybV9pbnRlbF9ibyAqKmJvOwotCXVpbnQzMl90ICpib19zdGFy dF92YWw7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5IHJlbG9jWzJdOwor CXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY19vYmplY3QyIG9ialszXTsKKwlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNidWZmZXIyIGViOworCXVpbnQzMl90ICpibywgKmJvX3N0YXJ0X3ZhbDsKIAl1 aW50MzJfdCBzdGFydCA9IDA7Ci0JaW50IGk7CisKKwltZW1zZXQocmVsb2MsIDAsIHNpemVvZihy ZWxvYykpOworCW1lbXNldChvYmosIDAsIHNpemVvZihvYmopKTsKKwlvYmpbMl0uaGFuZGxlID0g Y3JlYXRlX2JhdGNoKGZkLCByZWxvYyk7CisJb2JqWzJdLnJlbG9jc19wdHIgPSB0b191c2VyX3Bv aW50ZXIocmVsb2MpOworCW9ialsyXS5yZWxvY2F0aW9uX2NvdW50ID0gQVJSQVlfU0laRShyZWxv Yyk7CisKKwltZW1zZXQoJmViLCAwLCBzaXplb2YoZWIpKTsKKwllYi5idWZmZXJzX3B0ciA9IHRv X3VzZXJfcG9pbnRlcihvYmopOworCWViLmJ1ZmZlcl9jb3VudCA9IEFSUkFZX1NJWkUob2JqKTsK KwlpZiAoaW50ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQoZmQpKSA+IDYpCisJCWViLmZsYWdz ID0gSTkxNV9FWEVDX0JMVDsKIAogCWNvdW50IHw9IDE7CiAJaWd0X2luZm8oIlVzaW5nICVkIDFN aUIgYnVmZmVyc1xuIiwgY291bnQpOwogCi0JYm8gPSBtYWxsb2MoY291bnQgKiBzaXplb2YoKmJv KSk7Ci0JYm9fc3RhcnRfdmFsID0gbWFsbG9jKGNvdW50ICogc2l6ZW9mKCpib19zdGFydF92YWwp KTsKLQlpZ3RfYXNzZXJ0KGJvICYmIGJvX3N0YXJ0X3ZhbCk7Ci0KLQlidWZtZ3IgPSBkcm1faW50 ZWxfYnVmbWdyX2dlbV9pbml0KGZkLCA0MDk2KTsKLQlkcm1faW50ZWxfYnVmbWdyX2dlbV9lbmFi bGVfcmV1c2UoYnVmbWdyKTsKLQliYXRjaCA9IGludGVsX2JhdGNoYnVmZmVyX2FsbG9jKGJ1Zm1n ciwgaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkpOworCWJvID0gbWFsbG9jKGNvdW50ICogKHNpemVv ZigqYm8pICsgc2l6ZW9mKCpib19zdGFydF92YWwpKSk7CisJaWd0X2Fzc2VydChibyk7CisJYm9f c3RhcnRfdmFsID0gYm8gKyBjb3VudDsKIAotCWZvciAoaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7 CisJZm9yIChpbnQgaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7CiAJCWJvW2ldID0gY3JlYXRlX2Jv KGZkLCBzdGFydCk7CiAJCWJvX3N0YXJ0X3ZhbFtpXSA9IHN0YXJ0OwotCi0JCS8qCi0JCWlndF9p bmZvKCJDcmVhdGluZyBibyAlZFxuIiwgaSk7Ci0JCWNoZWNrX2JvKGJvW2ldLCBib19zdGFydF92 YWxbaV0pOwotCQkqLwotCiAJCXN0YXJ0ICs9IHdpZHRoICogaGVpZ2h0OwogCX0KIAotCWZvciAo aSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7Ci0JCWludCBzcmMgPSBjb3VudCAtIGkgLSAxOwotCQlp bnRlbF9jb3B5X2JvKGJhdGNoLCBib1tpXSwgYm9bc3JjXSwgYm9fc2l6ZSk7Ci0JCWJvX3N0YXJ0 X3ZhbFtpXSA9IGJvX3N0YXJ0X3ZhbFtzcmNdOworCWZvciAoaW50IGRzdCA9IDA7IGRzdCA8IGNv dW50OyBkc3QrKykgeworCQlpbnQgc3JjID0gY291bnQgLSBkc3QgLSAxOworCisJCWlmIChzcmMg PT0gZHN0KQorCQkJY29udGludWU7CisKKwkJcmVsb2NbMF0udGFyZ2V0X2hhbmRsZSA9IG9ialsw XS5oYW5kbGUgPSBib1tkc3RdOworCQlyZWxvY1sxXS50YXJnZXRfaGFuZGxlID0gb2JqWzFdLmhh bmRsZSA9IGJvW3NyY107CisKKwkJZ2VtX2V4ZWNidWYoZmQsICZlYik7CisJCWJvX3N0YXJ0X3Zh bFtkc3RdID0gYm9fc3RhcnRfdmFsW3NyY107CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IGNvdW50 ICogNDsgaSsrKSB7CisJZm9yIChpbnQgaSA9IDA7IGkgPCBjb3VudCAqIDQ7IGkrKykgewogCQlp bnQgc3JjID0gcmFuZG9tKCkgJSBjb3VudDsKIAkJaW50IGRzdCA9IHJhbmRvbSgpICUgY291bnQ7 CiAKIAkJaWYgKHNyYyA9PSBkc3QpCiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9jb3B5X2JvKGJh dGNoLCBib1tkc3RdLCBib1tzcmNdLCBib19zaXplKTsKLQkJYm9fc3RhcnRfdmFsW2RzdF0gPSBi b19zdGFydF92YWxbc3JjXTsKKwkJcmVsb2NbMF0udGFyZ2V0X2hhbmRsZSA9IG9ialswXS5oYW5k bGUgPSBib1tkc3RdOworCQlyZWxvY1sxXS50YXJnZXRfaGFuZGxlID0gb2JqWzFdLmhhbmRsZSA9 IGJvW3NyY107CiAKLQkJLyoKLQkJY2hlY2tfYm8oYm9bZHN0XSwgYm9fc3RhcnRfdmFsW2RzdF0p OwotCQlpZ3RfaW5mbygiJWQ6IGNvcHkgYm8gJWQgdG8gJWRcbiIsIGksIHNyYywgZHN0KTsKLQkJ Ki8KKwkJZ2VtX2V4ZWNidWYoZmQsICZlYik7CisJCWJvX3N0YXJ0X3ZhbFtkc3RdID0gYm9fc3Rh cnRfdmFsW3NyY107CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKLQkJLyoK LQkJaWd0X2luZm8oImNoZWNrICVkXG4iLCBpKTsKLQkJKi8KKwlmb3IgKGludCBpID0gMDsgaSA8 IGNvdW50OyBpKyspIHsKIAkJY2hlY2tfYm8oZmQsIGJvW2ldLCBib19zdGFydF92YWxbaV0pOwot Ci0JCWRybV9pbnRlbF9ib191bnJlZmVyZW5jZShib1tpXSk7Ci0JCWJvW2ldID0gTlVMTDsKKwkJ Z2VtX2Nsb3NlKGZkLCBib1tpXSk7CiAJfQotCi0JaW50ZWxfYmF0Y2hidWZmZXJfZnJlZShiYXRj aCk7Ci0JZHJtX2ludGVsX2J1Zm1ncl9kZXN0cm95KGJ1Zm1ncik7Ci0KLQlmcmVlKGJvX3N0YXJ0 X3ZhbCk7CiAJZnJlZShibyk7CisKKwlnZW1fY2xvc2UoZmQsIG9ialsyXS5oYW5kbGUpOwogfQog CiAjZGVmaW5lIE1BWF8zMmIgKCgxdWxsIDw8IDMyKSAtIDQwOTYpCkBAIC0xNzgsOSArMjExLDgg QEAgaWd0X21haW4KIAkJaWd0X3JlcXVpcmVfZ2VtKGZkKTsKIAl9CiAKLQlpZ3Rfc3VidGVzdCgi YmFzaWMiKSB7CisJaWd0X3N1YnRlc3QoImJhc2ljIikKIAkJcnVuX3Rlc3QgKGZkLCAyKTsKLQl9 CiAKIAkvKiB0aGUgcmVzdCBvZiB0aGUgdGVzdHMgYXJlIHRvbyBsb25nIGZvciBzaW11bGF0aW9u ICovCiAJaWd0X3NraXBfb25fc2ltdWxhdGlvbigpOwotLSAKMi4xOC4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdApp Z3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK