From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 166446E90E for ; Thu, 21 May 2020 07:48:33 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Thu, 21 May 2020 09:48:22 +0200 Message-Id: <20200521074823.18632-5-zbigniew.kempczynski@intel.com> In-Reply-To: <20200521074823.18632-1-zbigniew.kempczynski@intel.com> References: <20200521074823.18632-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 4/5] i915/gem_media_fill: Remove libdrm dependency List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Chris Wilson List-ID: V2Ugc3RpbGwgaGF2ZSBzb21lIGRlcGVuZGVuY2llcyB0byBsaWJkcm0gY29kZSBpbiBvdGhlciB0 ZXN0cyBzbwoiZGl2aWRlIGFuZCBjb25xdWVyIiBzdHJhdGVneSBpcyByZXF1aXJlZCB0byBtaWdy YXRlIGFuZCByZW1vdmUKb2xkIGNvZGUuIEFkZCBuby1saWJkcm0gdmVyc2lvbiB0byBjb250aW51 ZSBtaWdyYXRpb24gcHJvY2Vzcy4KClNpZ25lZC1vZmYtYnk6IFpiaWduaWV3IEtlbXBjennFhHNr aSA8emJpZ25pZXcua2VtcGN6eW5za2lAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogdGVzdHMvaTkxNS9nZW1fbWVkaWFfZmlsbC5jIHwg MTI3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDk5IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5 MTUvZ2VtX21lZGlhX2ZpbGwuYyBiL3Rlc3RzL2k5MTUvZ2VtX21lZGlhX2ZpbGwuYwppbmRleCAz ZjBmZWM1Ny4uN2M5NzU1NzcgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX21lZGlhX2ZpbGwu YworKysgYi90ZXN0cy9pOTE1L2dlbV9tZWRpYV9maWxsLmMKQEAgLTYzLDYgKzYzLDcgQEAgdHlw ZWRlZiBzdHJ1Y3QgewogCXVpbnQzMl90IGRldmlkOwogCWRybV9pbnRlbF9idWZtZ3IgKmJ1Zm1n cjsKIAl1aW50OF90IGxpbmVhcltXSURUSCAqIEhFSUdIVF07CisJc3RydWN0IGJ1Zl9vcHMgKmJv cHM7CiB9IGRhdGFfdDsKIAogc3RhdGljIHZvaWQgc2NyYXRjaF9idWZfaW5pdChkYXRhX3QgKmRh dGEsIHN0cnVjdCBpZ3RfYnVmICpidWYsCkBAIC04Niw2ICs4NywzNCBAQCBzdGF0aWMgdm9pZCBz Y3JhdGNoX2J1Zl9pbml0KGRhdGFfdCAqZGF0YSwgc3RydWN0IGlndF9idWYgKmJ1ZiwKIAlidWYt PmJwcCA9IDMyOwogfQogCitzdGF0aWMgc3RydWN0IGludGVsX2J1ZiAqCitjcmVhdGVfYnVmKGRh dGFfdCAqZGF0YSwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCB1aW50OF90IGNvbG9yKQoreworCXN0 cnVjdCBpbnRlbF9idWYgKmJ1ZjsKKwl1aW50OF90ICpwdHI7CisJaW50IGk7CisKKwlidWYgPSBj YWxsb2MoMSwgc2l6ZW9mKCpidWYpKTsKKwlpZ3RfYXNzZXJ0KGJ1Zik7CisKKwkvKgorCSAqIExl Z2FjeSBjb2RlIHVzZXMgMzIgYnBwIGFmdGVyIGJ1ZmZlciBjcmVhdGlvbi4KKwkgKiBMZXQncyBk byB0aGUgc2FtZSBkdWUgdG8ga2VlcCBzaGFkZXIgaW50YWN0LgorCSAqLworCWludGVsX2J1Zl9p bml0KGRhdGEtPmJvcHMsIGJ1Ziwgd2lkdGgvNCwgaGVpZ2h0LCAzMiwgMCwKKwkJICAgICAgIEk5 MTVfVElMSU5HX05PTkUsIDApOworCisJcHRyID0gZ2VtX21tYXBfX2NwdV9jb2hlcmVudChkYXRh LT5kcm1fZmQsCisJCQkJICAgICBidWYtPmhhbmRsZSwgMCwgYnVmLT5zaXplLCBQUk9UX1dSSVRF KTsKKworCWZvciAoaSA9IDA7IGkgPCBidWYtPnNpemU7IGkrKykKKwkJcHRyW2ldID0gY29sb3I7 CisKKwltdW5tYXAocHRyLCBidWYtPnNpemUpOworCisJcmV0dXJuIGJ1ZjsKK30KKwogc3RhdGlj IHZvaWQKIHNjcmF0Y2hfYnVmX2NoZWNrKGRhdGFfdCAqZGF0YSwgc3RydWN0IGlndF9idWYgKmJ1 ZiwgaW50IHgsIGludCB5LAogCQl1aW50OF90IGNvbG9yKQpAQCAtMTAwLDQ4ICsxMjksOTAgQEAg c2NyYXRjaF9idWZfY2hlY2soZGF0YV90ICpkYXRhLCBzdHJ1Y3QgaWd0X2J1ZiAqYnVmLCBpbnQg eCwgaW50IHksCiAJCSAgICAgY29sb3IsIHZhbCwgeCwgeSk7CiB9CiAKLWlndF9zaW1wbGVfbWFp bgorc3RhdGljIHZvaWQgYnVmX2NoZWNrKHVpbnQ4X3QgKnB0ciwgaW50IHgsIGludCB5LCB1aW50 OF90IGNvbG9yKQoreworCXVpbnQ4X3QgdmFsOworCisJdmFsID0gcHRyW3kgKiBXSURUSCArIHhd OworCWlndF9hc3NlcnRfZih2YWwgPT0gY29sb3IsCisJCSAgICAgIkV4cGVjdGVkIDB4JTAyeCwg Zm91bmQgMHglMDJ4IGF0ICglZCwlZClcbiIsCisJCSAgICAgY29sb3IsIHZhbCwgeCwgeSk7Cit9 CisKK3N0YXRpYyB2b2lkIG5vX2xpYmRybShkYXRhX3QgKmRhdGEsIGlndF9maWxsZnVuY192Ml90 IGZpbGwpCit7CisJc3RydWN0IGludGVsX2J1ZiAqYnVmOworCXVpbnQ4X3QgKnB0cjsKKwlpbnQg aSwgajsKKworCWJ1ZiA9IGNyZWF0ZV9idWYoZGF0YSwgV0lEVEgsIEhFSUdIVCwgQ09MT1JfQzQp OworCXB0ciA9IGdlbV9tbWFwX19kZXZpY2VfY29oZXJlbnQoZGF0YS0+ZHJtX2ZkLCBidWYtPmhh bmRsZSwKKwkJCQkJMCwgYnVmLT5zaXplLCBQUk9UX1JFQUQpOworCWZvciAoaSA9IDA7IGkgPCBX SURUSDsgaSsrKQorCQlmb3IgKGogPSAwOyBqIDwgSEVJR0hUOyBqKyspCisJCQlidWZfY2hlY2so cHRyLCBpLCBqLCBDT0xPUl9DNCk7CisKKwlmaWxsKGRhdGEtPmRybV9mZCwgYnVmLCAwLCAwLCBX SURUSCAvIDIsIEhFSUdIVCAvIDIsIENPTE9SXzRDKTsKKworCWZvciAoaSA9IDA7IGkgPCBXSURU SDsgaSsrKQorCQlmb3IgKGogPSAwOyBqIDwgSEVJR0hUOyBqKyspCisJCQlpZiAoaSA8IFdJRFRI IC8gMiAmJiBqIDwgSEVJR0hUIC8gMikKKwkJCQlidWZfY2hlY2socHRyLCBpLCBqLCBDT0xPUl80 Qyk7CisJCQllbHNlCisJCQkJYnVmX2NoZWNrKHB0ciwgaSwgaiwgQ09MT1JfQzQpOworCisJbXVu bWFwKHB0ciwgYnVmLT5zaXplKTsKK30KKworc3RhdGljIHZvaWQgd2l0aF9saWJkcm0oZGF0YV90 ICpkYXRhLCBpZ3RfZmlsbGZ1bmNfdCBmaWxsKQogewotCWRhdGFfdCBkYXRhID0gezAsIH07CiAJ c3RydWN0IGludGVsX2JhdGNoYnVmZmVyICpiYXRjaCA9IE5VTEw7CiAJc3RydWN0IGlndF9idWYg ZHN0OwotCWlndF9maWxsZnVuY190IG1lZGlhX2ZpbGwgPSBOVUxMOwogCWludCBpLCBqOwogCisJ YmF0Y2ggPSBpbnRlbF9iYXRjaGJ1ZmZlcl9hbGxvYyhkYXRhLT5idWZtZ3IsIGRhdGEtPmRldmlk KTsKKwlpZ3RfYXNzZXJ0KGJhdGNoKTsKKworCXNjcmF0Y2hfYnVmX2luaXQoZGF0YSwgJmRzdCwg V0lEVEgsIEhFSUdIVCwgU1RSSURFLCBDT0xPUl9DNCk7CisKKwlmb3IgKGkgPSAwOyBpIDwgV0lE VEg7IGkrKykKKwkJZm9yIChqID0gMDsgaiA8IEhFSUdIVDsgaisrKQorCQkJc2NyYXRjaF9idWZf Y2hlY2soZGF0YSwgJmRzdCwgaSwgaiwgQ09MT1JfQzQpOworCisJZmlsbChiYXRjaCwgJmRzdCwg MCwgMCwgV0lEVEggLyAyLCBIRUlHSFQgLyAyLCBDT0xPUl80Qyk7CisKKwlmb3IgKGkgPSAwOyBp IDwgV0lEVEg7IGkrKykKKwkJZm9yIChqID0gMDsgaiA8IEhFSUdIVDsgaisrKQorCQkJaWYgKGkg PCBXSURUSCAvIDIgJiYgaiA8IEhFSUdIVCAvIDIpCisJCQkJc2NyYXRjaF9idWZfY2hlY2soZGF0 YSwgJmRzdCwgaSwgaiwgQ09MT1JfNEMpOworCQkJZWxzZQorCQkJCXNjcmF0Y2hfYnVmX2NoZWNr KGRhdGEsICZkc3QsIGksIGosIENPTE9SX0M0KTsKKworfQorCitpZ3Rfc2ltcGxlX21haW4KK3sK KwlkYXRhX3QgZGF0YSA9IHswLCB9OworCWlndF9maWxsZnVuY190IG1lZGlhX2ZpbGwgPSBOVUxM OworCWlndF9maWxsZnVuY192Ml90IG1lZGlhX2ZpbGxfdjIgPSBOVUxMOworCiAJZGF0YS5kcm1f ZmQgPSBkcm1fb3Blbl9kcml2ZXJfcmVuZGVyKERSSVZFUl9JTlRFTCk7CiAJaWd0X3JlcXVpcmVf Z2VtKGRhdGEuZHJtX2ZkKTsKIAogCWRhdGEuZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2RldmlkKGRh dGEuZHJtX2ZkKTsKKwlkYXRhLmJvcHMgPSBidWZfb3BzX2NyZWF0ZShkYXRhLmRybV9mZCk7CiAK IAlkYXRhLmJ1Zm1nciA9IGRybV9pbnRlbF9idWZtZ3JfZ2VtX2luaXQoZGF0YS5kcm1fZmQsIDQw OTYpOwogCWlndF9hc3NlcnQoZGF0YS5idWZtZ3IpOwogCiAJbWVkaWFfZmlsbCA9IGlndF9nZXRf bWVkaWFfZmlsbGZ1bmMoZGF0YS5kZXZpZCk7CisJbWVkaWFfZmlsbF92MiA9IGlndF9nZXRfbWVk aWFfZmlsbGZ1bmNfdjIoZGF0YS5kZXZpZCk7CiAKLQlpZ3RfcmVxdWlyZV9mKG1lZGlhX2ZpbGws Ci0JCSJubyBtZWRpYS1maWxsIGZ1bmN0aW9uXG4iKTsKKwlpZ3RfcmVxdWlyZV9mKG1lZGlhX2Zp bGwgfHwgbWVkaWFfZmlsbF92MiwKKwkJICAgICAgIm5vIG1lZGlhLWZpbGwgZnVuY3Rpb25cbiIp OwogCi0JYmF0Y2ggPSBpbnRlbF9iYXRjaGJ1ZmZlcl9hbGxvYyhkYXRhLmJ1Zm1nciwgZGF0YS5k ZXZpZCk7Ci0JaWd0X2Fzc2VydChiYXRjaCk7Ci0KLQlzY3JhdGNoX2J1Zl9pbml0KCZkYXRhLCAm ZHN0LCBXSURUSCwgSEVJR0hULCBTVFJJREUsIENPTE9SX0M0KTsKLQotCWZvciAoaSA9IDA7IGkg PCBXSURUSDsgaSsrKSB7Ci0JCWZvciAoaiA9IDA7IGogPCBIRUlHSFQ7IGorKykgewotCQkJc2Ny YXRjaF9idWZfY2hlY2soJmRhdGEsICZkc3QsIGksIGosIENPTE9SX0M0KTsKLQkJfQotCX0KLQot CW1lZGlhX2ZpbGwoYmF0Y2gsCi0JCSZkc3QsIDAsIDAsIFdJRFRIIC8gMiwgSEVJR0hUIC8gMiwK LQkJQ09MT1JfNEMpOwotCi0JZm9yIChpID0gMDsgaSA8IFdJRFRIOyBpKyspIHsKLQkJZm9yIChq ID0gMDsgaiA8IEhFSUdIVDsgaisrKSB7Ci0JCQlpZiAoaSA8IFdJRFRIIC8gMiAmJiBqIDwgSEVJ R0hUIC8gMikKLQkJCQlzY3JhdGNoX2J1Zl9jaGVjaygmZGF0YSwgJmRzdCwgaSwgaiwgQ09MT1Jf NEMpOwotCQkJZWxzZQotCQkJCXNjcmF0Y2hfYnVmX2NoZWNrKCZkYXRhLCAmZHN0LCBpLCBqLCBD T0xPUl9DNCk7Ci0JCX0KLQl9CisJaWYgKG1lZGlhX2ZpbGxfdjIpCisJCW5vX2xpYmRybSgmZGF0 YSwgbWVkaWFfZmlsbF92Mik7CisJZWxzZQorCQl3aXRoX2xpYmRybSgmZGF0YSwgbWVkaWFfZmls bCk7CiB9Ci0tIAoyLjI2LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dgo=