From: Rob Clark Subject: [RFCv0 6/8] freedreno/ir3: add support for NIR as preferred IR Date: Mon, 19 Oct 2015 15:47:59 -0400 Message-ID: <1445284081-29532-7-git-send-email-robdclark@gmail.com> References: <1445284081-29532-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f46.google.com (mail-qg0-f46.google.com [209.85.192.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7B13720F2 for ; Mon, 19 Oct 2015 12:48:16 -0700 (PDT) Received: by qgeo38 with SMTP id o38so123902611qge.0 for ; Mon, 19 Oct 2015 12:48:16 -0700 (PDT) In-Reply-To: <1445284081-29532-1-git-send-email-robdclark@gmail.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: Jason Ekstrand List-Id: dri-devel@lists.freedesktop.org Rm9yIG5vdyB1bmRlciBkZWJ1ZyBmbGFnLCBzaW5jZSBvbmx5IHN1aXRhYmxlIGZvciBkZWJ1Z2dp bmcvdGVzdGluZy4KLS0tCiBzcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9mcmVlZHJlbm9f c2NyZWVuLmMgICB8ICA1ICsrKy0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2ZyZWVk cmVub191dGlsLmggICAgIHwgIDEgKwogLi4uL2RyaXZlcnMvZnJlZWRyZW5vL2lyMy9pcjNfY29t cGlsZXJfbmlyLmMgICAgICAgfCAxNSArKysrKysrKysrLQogc3JjL2dhbGxpdW0vZHJpdmVycy9m cmVlZHJlbm8vaXIzL2lyM19zaGFkZXIuYyAgICAgfCAzMCArKysrKysrKysrKysrKysrKysrLS0t CiBzcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9pcjMvaXIzX3NoYWRlci5oICAgICB8ICAz ICsrKwogNSBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2ZyZWVkcmVub19zY3Jl ZW4uYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2ZyZWVkcmVub19zY3JlZW4uYwpp bmRleCBiNjRmNzhjLi4zMGRlZjhlIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2Zy ZWVkcmVuby9mcmVlZHJlbm9fc2NyZWVuLmMKKysrIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9mcmVl ZHJlbm8vZnJlZWRyZW5vX3NjcmVlbi5jCkBAIC03MSw2ICs3MSw3IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZGVidWdfbmFtZWRfdmFsdWUgZGVidWdfb3B0aW9uc1tdID0gewogCQl7Imdsc2wxMjAi LCAgIEZEX0RCR19HTFNMMTIwLCJUZW1wb3JhcnkgZmxhZyB0byBmb3JjZSBHTFNMIDEuMjAgKHJh dGhlciB0aGFuIDEuMzApIG9uIGEzeHgrIn0sCiAJCXsic2hhZGVyZGIiLCAgRkRfREJHX1NIQURF UkRCLCAiRW5hYmxlIHNoYWRlcmRiIG91dHB1dCJ9LAogCQl7ImZsdXNoIiwgICAgIEZEX0RCR19G TFVTSCwgICJGb3JjZSBmbHVzaCBhZnRlciBldmVyeSBkcmF3In0sCisJCXsibmlyIiwgICAgICAg RkRfREJHX05JUiwgICAgIlByZWZlciBOSVIgYXMgbmF0aXZlIElSIn0sCiAJCURFQlVHX05BTUVE X1ZBTFVFX0VORAogfTsKIApAQCAtMzk4LDcgKzM5OSw3IEBAIGZkX3NjcmVlbl9nZXRfc2hhZGVy X3BhcmFtKHN0cnVjdCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwgdW5zaWduZWQgc2hhZGVyLAogCWNh c2UgUElQRV9TSEFERVJfQ0FQX1RHU0lfRFJPVU5EX1NVUFBPUlRFRDoKIAljYXNlIFBJUEVfU0hB REVSX0NBUF9UR1NJX0RGUkFDRVhQX0RMREVYUF9TVVBQT1JURUQ6CiAJY2FzZSBQSVBFX1NIQURF Ul9DQVBfVEdTSV9GTUFfU1VQUE9SVEVEOgotICAgICAgICBjYXNlIFBJUEVfU0hBREVSX0NBUF9U R1NJX0FOWV9JTk9VVF9ERUNMX1JBTkdFOgorCWNhc2UgUElQRV9TSEFERVJfQ0FQX1RHU0lfQU5Z X0lOT1VUX0RFQ0xfUkFOR0U6CiAJCXJldHVybiAwOwogCWNhc2UgUElQRV9TSEFERVJfQ0FQX1RH U0lfU1FSVF9TVVBQT1JURUQ6CiAJCXJldHVybiAxOwpAQCAtNDEwLDYgKzQxMSw4IEBAIGZkX3Nj cmVlbl9nZXRfc2hhZGVyX3BhcmFtKHN0cnVjdCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwgdW5zaWdu ZWQgc2hhZGVyLAogCWNhc2UgUElQRV9TSEFERVJfQ0FQX01BWF9TQU1QTEVSX1ZJRVdTOgogCQly ZXR1cm4gMTY7CiAJY2FzZSBQSVBFX1NIQURFUl9DQVBfUFJFRkVSUkVEX0lSOgorCQlpZiAoKGZk X21lc2FfZGVidWcgJiBGRF9EQkdfTklSKSAmJiBpc19pcjMoc2NyZWVuKSkKKwkJCXJldHVybiBQ SVBFX1NIQURFUl9JUl9OSVI7CiAJCXJldHVybiBQSVBFX1NIQURFUl9JUl9UR1NJOwogCX0KIAlk ZWJ1Z19wcmludGYoInVua25vd24gc2hhZGVyIHBhcmFtICVkXG4iLCBwYXJhbSk7CmRpZmYgLS1n aXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9mcmVlZHJlbm9fdXRpbC5oIGIvc3Jj L2dhbGxpdW0vZHJpdmVycy9mcmVlZHJlbm8vZnJlZWRyZW5vX3V0aWwuaAppbmRleCAwZDI0MThl Li41NmQzMjM1IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9mcmVl ZHJlbm9fdXRpbC5oCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2ZyZWVkcmVu b191dGlsLmgKQEAgLTczLDYgKzczLDcgQEAgZW51bSBhZHJlbm9fc3RlbmNpbF9vcCBmZF9zdGVu Y2lsX29wKHVuc2lnbmVkIG9wKTsKICNkZWZpbmUgRkRfREJHX0dMU0wxMjAgIDB4MDQwMAogI2Rl ZmluZSBGRF9EQkdfU0hBREVSREIgMHgwODAwCiAjZGVmaW5lIEZEX0RCR19GTFVTSCAgICAweDEw MDAKKyNkZWZpbmUgRkRfREJHX05JUiAgICAgIDB4MjAwMAogCiBleHRlcm4gaW50IGZkX21lc2Ff ZGVidWc7CiBleHRlcm4gYm9vbCBmZF9iaW5uaW5nX2VuYWJsZWQ7CmRpZmYgLS1naXQgYS9zcmMv Z2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9pcjMvaXIzX2NvbXBpbGVyX25pci5jIGIvc3JjL2dh bGxpdW0vZHJpdmVycy9mcmVlZHJlbm8vaXIzL2lyM19jb21waWxlcl9uaXIuYwppbmRleCBiNGU1 NDgzLi41YTUzZTMyIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9p cjMvaXIzX2NvbXBpbGVyX25pci5jCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5v L2lyMy9pcjNfY29tcGlsZXJfbmlyLmMKQEAgLTE2NCw3ICsxNjQsMTQgQEAgdG9fbmlyKHN0cnVj dCBpcjNfY29tcGlsZSAqY3R4LCBzdHJ1Y3QgaXIzX3NoYWRlcl92YXJpYW50ICpzbykKIAkJdGV4 X29wdGlvbnMubG93ZXJfdHhwID0gKDEgPDwgR0xTTF9TQU1QTEVSX0RJTV8zRCk7CiAJfQogCi0J c3RydWN0IG5pcl9zaGFkZXIgKnMgPSB0Z3NpX3RvX25pcihzby0+c2hhZGVyLT50b2tlbnMsICZv cHRpb25zKTsKKwlzdHJ1Y3QgbmlyX3NoYWRlciAqczsKKworCWlmIChzby0+c2hhZGVyLT5uaXIp IHsKKwkJLy8gWFhYIG5lZWQgbmlyX2Nsb25lKCkgaGVyZS4uCisJCXMgPSBzby0+c2hhZGVyLT5u aXI7CisJfSBlbHNlIHsKKwkJcyA9IHRnc2lfdG9fbmlyKHNvLT5zaGFkZXItPnRva2VucywgJm9w dGlvbnMpOworCX0KIAogCWlmIChmZF9tZXNhX2RlYnVnICYgRkRfREJHX09QVE1TR1MpIHsKIAkJ ZGVidWdfcHJpbnRmKCItLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4iKTsKQEAgLTI5Miw2ICsyOTks MTIgQEAgY29tcGlsZV9lcnJvcihzdHJ1Y3QgaXIzX2NvbXBpbGUgKmN0eCwgY29uc3QgY2hhciAq Zm9ybWF0LCAuLi4pCiBzdGF0aWMgdm9pZAogY29tcGlsZV9mcmVlKHN0cnVjdCBpcjNfY29tcGls ZSAqY3R4KQogeworCS8qIFRPRE8gLi4gcHJvYmFibHkgbmVlZCBhIHJhbGxvY19mcmVlKGN0eC0+ cykgaGVyZSwgYXQgbGVhc3QKKwkgKiBmb3IgdGhlIHRnc2lfdG9fbmlyIGNhc2UuLiByaWdodCBu b3cgaW4gdGhlIGNhc2Ugd2UgZ2V0CisJICogTklSIGRpcmVjdGx5LCB3ZSB3YW50IHRvIHNraXAg dGhpcyBzaW5jZSB0aGUgbmlyX3NoYWRlciBpc24ndAorCSAqIGdldHRpbmcgY2xvbmVkLi4gIGFu ZC9vciBpZiBpdCB3YXMgd2UgbWlnaHQgYmUgd2FudGluZyB0bworCSAqIGZyZWUgaXQgaW4gaXIz X3NoYWRlcl9kZXN0cm95KCk/PworCSAqLwogCXJhbGxvY19mcmVlKGN0eCk7CiB9CiAKZGlmZiAt LWdpdCBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2lyMy9pcjNfc2hhZGVyLmMgYi9z cmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9pcjMvaXIzX3NoYWRlci5jCmluZGV4IDdiNTY1 MzMuLjBjYmY4ZmUgMTAwNjQ0Ci0tLSBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2ly My9pcjNfc2hhZGVyLmMKKysrIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9mcmVlZHJlbm8vaXIzL2ly M19zaGFkZXIuYwpAQCAtMzksNiArMzksNyBAQAogCiAjaW5jbHVkZSAiaXIzX3NoYWRlci5oIgog I2luY2x1ZGUgImlyM19jb21waWxlci5oIgorI2luY2x1ZGUgImlyM19uaXIuaCIKIAogCiBzdGF0 aWMgdm9pZApAQCAtMTg4LDkgKzE4OSwxNSBAQCBjcmVhdGVfdmFyaWFudChzdHJ1Y3QgaXIzX3No YWRlciAqc2hhZGVyLCBzdHJ1Y3QgaXIzX3NoYWRlcl9rZXkga2V5KQogCXYtPnR5cGUgPSBzaGFk ZXItPnR5cGU7CiAKIAlpZiAoZmRfbWVzYV9kZWJ1ZyAmIEZEX0RCR19ESVNBU00pIHsKLQkJREJH KCJkdW1wIHRnc2k6IHR5cGU9JWQsIGs9e2JwPSV1LGN0cz0ldSxocD0ldX0iLCBzaGFkZXItPnR5 cGUsCi0JCQlrZXkuYmlubmluZ19wYXNzLCBrZXkuY29sb3JfdHdvX3NpZGUsIGtleS5oYWxmX3By ZWNpc2lvbik7Ci0JCXRnc2lfZHVtcChzaGFkZXItPnRva2VucywgMCk7CisJCWlmIChzaGFkZXIt Pm5pcikgeworCQkJREJHKCJkdW1wIG5pcjogdHlwZT0lZCwgaz17YnA9JXUsY3RzPSV1LGhwPSV1 fSIsIHNoYWRlci0+dHlwZSwKKwkJCQkJa2V5LmJpbm5pbmdfcGFzcywga2V5LmNvbG9yX3R3b19z aWRlLCBrZXkuaGFsZl9wcmVjaXNpb24pOworCQkJbmlyX3ByaW50X3NoYWRlcihzaGFkZXItPm5p ciwgc3RkZXJyKTsKKwkJfSBlbHNlIHsKKwkJCURCRygiZHVtcCB0Z3NpOiB0eXBlPSVkLCBrPXti cD0ldSxjdHM9JXUsaHA9JXV9Iiwgc2hhZGVyLT50eXBlLAorCQkJCQlrZXkuYmlubmluZ19wYXNz LCBrZXkuY29sb3JfdHdvX3NpZGUsIGtleS5oYWxmX3ByZWNpc2lvbik7CisJCQl0Z3NpX2R1bXAo c2hhZGVyLT50b2tlbnMsIDApOworCQl9CiAJfQogCiAJcmV0ID0gaXIzX2NvbXBpbGVfc2hhZGVy X25pcihzaGFkZXItPmNvbXBpbGVyLCB2KTsKQEAgLTI2Nyw3ICsyNzQsOSBAQCBpcjNfc2hhZGVy X2Rlc3Ryb3koc3RydWN0IGlyM19zaGFkZXIgKnNoYWRlcikKIAkJdiA9IHYtPm5leHQ7CiAJCWRl bGV0ZV92YXJpYW50KHQpOwogCX0KKwogCWZyZWUoKHZvaWQgKilzaGFkZXItPnRva2Vucyk7CisJ LyogWFhYIHJhbGxvY19mcmVlKHNoYWRlci0+bmlyKTsgKi8KIAlmcmVlKHNoYWRlcik7CiB9CiAK QEAgLTI4MSw3ICsyOTAsMjAgQEAgaXIzX3NoYWRlcl9jcmVhdGUoc3RydWN0IHBpcGVfY29udGV4 dCAqcGN0eCwKIAlzaGFkZXItPmlkID0gKytzaGFkZXItPmNvbXBpbGVyLT5zaGFkZXJfY291bnQ7 CiAJc2hhZGVyLT5wY3R4ID0gcGN0eDsKIAlzaGFkZXItPnR5cGUgPSB0eXBlOwotCXNoYWRlci0+ dG9rZW5zID0gdGdzaV9kdXBfdG9rZW5zKGNzby0+dG9rZW5zKTsKKwlpZiAoY3NvLT5pciA9PSBQ SVBFX1NIQURFUl9JUl9OSVIpIHsKKwkJLyogVE9ETyBtaWdodCBuZWVkIG5pcl9jbG9uZSgpIGhl cmUuLiBEZXBlbmRzIGEgYml0IG9uIGhvdyB3ZQorCQkgKiBkZWZpbmUgdGhlIGxpZmVjeWNsZSBv ZiBjc28tPm5pci4gIElmIHdlIGNvdWxkIGFzc3VtZSB0aGF0IGl0CisJCSAqIGFsd2F5cyBzdGlj a3MgYXJvdW5kIHVudGlsIHRoZSBjc28gaXMgZGVzdHJveWVkLCB0aGVuIHdlJ2QKKwkJICogb25s eSBuZWVkIHRvIGNsb25lIGluIHRvX25pcigpIChmb3IgdGhlIHZhcmlhbnQgc3BlY2lmaWMKKwkJ ICogbG93ZXJpbmcpLCByYXRoZXIgdGhhbiBib3RoIGhlcmUgYW5kIHRvX25pcigpLiAgVGhpcyBp cyBhIGJpdAorCQkgKiBkaWZmZXJlbnQgZnJvbSB0aGUgbGlmZXRpbWUgb2YgY3NvLT50b2tlbnMg d2hpY2ggc29tZXRpbWVzCisJCSAqIGJ1dCBub3QgYWx3YXlzIGdvZXMgYXdheSBhZnRlciB0aGUg cGlwZS0+cGlwZV9jcmVhdGVfeHl6X3N0YXRlKCkKKwkJICogY2FsbCAod2hpY2ggaXMgdW5mb3J0 dW5hdGUsIGFuZCBtYXliZSB3b3J0aCBmaXhpbmcpLgorCQkgKi8KKwkJc2hhZGVyLT5uaXIgPSBj c28tPm5pcjsKKwl9IGVsc2UgeworCQlzaGFkZXItPnRva2VucyA9IHRnc2lfZHVwX3Rva2Vucyhj c28tPnRva2Vucyk7CisJfQogCXNoYWRlci0+c3RyZWFtX291dHB1dCA9IGNzby0+c3RyZWFtX291 dHB1dDsKIAlpZiAoZmRfbWVzYV9kZWJ1ZyAmIEZEX0RCR19TSEFERVJEQikgewogCQkvKiBpZiBz aGFkZXItZGIgcnVuLCBjcmVhdGUgYSBzdGFuZGFyZCB2YXJpYW50IGltbWVkaWF0ZWx5CmRpZmYg LS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9pcjMvaXIzX3NoYWRlci5oIGIv c3JjL2dhbGxpdW0vZHJpdmVycy9mcmVlZHJlbm8vaXIzL2lyM19zaGFkZXIuaAppbmRleCA3ZTJj MjdkLi45ZWYzMjc3IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL2ZyZWVkcmVuby9p cjMvaXIzX3NoYWRlci5oCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvZnJlZWRyZW5vL2lyMy9p cjNfc2hhZGVyLmgKQEAgLTIyMCw2ICsyMjAsOCBAQCBzdHJ1Y3QgaXIzX3NoYWRlcl92YXJpYW50 IHsKIAlzdHJ1Y3QgaXIzX3NoYWRlciAqc2hhZGVyOwogfTsKIAordHlwZWRlZiBzdHJ1Y3Qgbmly X3NoYWRlciBuaXJfc2hhZGVyOworCiBzdHJ1Y3QgaXIzX3NoYWRlciB7CiAJZW51bSBzaGFkZXJf dCB0eXBlOwogCkBAIC0yMzAsNiArMjMyLDcgQEAgc3RydWN0IGlyM19zaGFkZXIgewogCXN0cnVj dCBpcjNfY29tcGlsZXIgKmNvbXBpbGVyOwogCiAJc3RydWN0IHBpcGVfY29udGV4dCAqcGN0eDsK KwluaXJfc2hhZGVyICpuaXI7CiAJY29uc3Qgc3RydWN0IHRnc2lfdG9rZW4gKnRva2VuczsKIAlz dHJ1Y3QgcGlwZV9zdHJlYW1fb3V0cHV0X2luZm8gc3RyZWFtX291dHB1dDsKIAotLSAKMi41LjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==