From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Micha=C5=82=20Winiarski?= Subject: [PATCH v3 03/13] drm/i915/guc: Merge log relay file and channel creation Date: Mon, 19 Mar 2018 10:53:38 +0100 Message-ID: <20180319095348.9716-3-michal.winiarski@intel.com> References: <20180319095348.9716-1-michal.winiarski@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D36206E4E9 for ; Mon, 19 Mar 2018 09:54:07 +0000 (UTC) In-Reply-To: <20180319095348.9716-1-michal.winiarski@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2UgaGF2ZSBhbGwgdGhlIGluZm9ybWF0aW9uIHdlIG5lZWQgYXQgcmVsYXlfb3BlbiBjYWxsIHRp bWUuClNpbmNlIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIHNwbGl0IHRoZSBwcm9jZXNzIGludG8gcmVs YXlfb3BlbiBhbmQKcmVsYXlfbGF0ZV9zZXR1cF9maWxlcywgbGV0J3MgcmVtb3ZlIHRoZSBleHRy YSBjb2RlLgoKdjI6IFJlbW92ZSBvYnNvbGV0ZWQgY29tbWVudHMgKFNhZ2FyKQp2MzogVGhlcmUg d2FzIG9uZSBvYnNvbGV0ZSBjb21tZW50IGxlZnQgKFNhZ2FyKQoKU2lnbmVkLW9mZi1ieTogTWlj aGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlv IDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUg PHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53 YWpkZWN6a29AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2Fy LmEua2FtYmxlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf bG9nLmMgfCA2NSArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDYwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2cuYwppbmRleCBiODI4NjZiZmJlZjUuLjc2N2MwZDAwZmNhNiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwpAQCAtMTQxLDE0ICsxNDEsNyBAQCBzdGF0aWMg c3RydWN0IGRlbnRyeSAqY3JlYXRlX2J1Zl9maWxlX2NhbGxiYWNrKGNvbnN0IGNoYXIgKmZpbGVu YW1lLAogCWlmICghcGFyZW50KQogCQlyZXR1cm4gTlVMTDsKIAotCS8qCi0JICogTm90IHVzaW5n IHRoZSBjaGFubmVsIGZpbGVuYW1lIHBhc3NlZCBhcyBhbiBhcmd1bWVudCwgc2luY2UgZm9yIGVh Y2gKLQkgKiBjaGFubmVsIHJlbGF5IGFwcGVuZHMgdGhlIGNvcnJlc3BvbmRpbmcgQ1BVIG51bWJl ciB0byB0aGUgZmlsZW5hbWUKLQkgKiBwYXNzZWQgaW4gcmVsYXlfb3BlbigpLiBUaGlzIHNob3Vs ZCBiZSBmaW5lIGFzIHJlbGF5IGp1c3QgbmVlZHMgYQotCSAqIGRlbnRyeSBvZiB0aGUgZmlsZSBh c3NvY2lhdGVkIHdpdGggdGhlIGNoYW5uZWwgYnVmZmVyIGFuZCB0aGF0IGZpbGUncwotCSAqIG5h bWUgbmVlZCBub3QgYmUgc2FtZSBhcyB0aGUgZmlsZW5hbWUgcGFzc2VkIGFzIGFuIGFyZ3VtZW50 LgotCSAqLwotCWJ1Zl9maWxlID0gZGVidWdmc19jcmVhdGVfZmlsZSgiZ3VjX2xvZyIsIG1vZGUs CisJYnVmX2ZpbGUgPSBkZWJ1Z2ZzX2NyZWF0ZV9maWxlKGZpbGVuYW1lLCBtb2RlLAogCQkJCSAg ICAgICBwYXJlbnQsIGJ1ZiwgJnJlbGF5X2ZpbGVfb3BlcmF0aW9ucyk7CiAJcmV0dXJuIGJ1Zl9m aWxlOwogfQpAQCAtMTY5LDQ1ICsxNjIsNiBAQCBzdGF0aWMgc3RydWN0IHJjaGFuX2NhbGxiYWNr cyByZWxheV9jYWxsYmFja3MgPSB7CiAJLnJlbW92ZV9idWZfZmlsZSA9IHJlbW92ZV9idWZfZmls ZV9jYWxsYmFjaywKIH07CiAKLXN0YXRpYyBpbnQgZ3VjX2xvZ19yZWxheV9maWxlX2NyZWF0ZShz dHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKQotewotCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9IGxv Z190b19ndWMobG9nKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNf dG9faTkxNShndWMpOwotCXN0cnVjdCBkZW50cnkgKmxvZ19kaXI7Ci0JaW50IHJldDsKLQotCWxv Y2tkZXBfYXNzZXJ0X2hlbGQoJmxvZy0+cnVudGltZS5sb2NrKTsKLQotCS8qIEZvciBub3cgY3Jl YXRlIHRoZSBsb2cgZmlsZSBpbiAvc3lzL2tlcm5lbC9kZWJ1Zy9kcmkvMCBkaXIgKi8KLQlsb2df ZGlyID0gZGV2X3ByaXYtPmRybS5wcmltYXJ5LT5kZWJ1Z2ZzX3Jvb3Q7Ci0KLQkvKgotCSAqIElm IC9zeXMva2VybmVsL2RlYnVnL2RyaS8wIGxvY2F0aW9uIGRvIG5vdCBleGlzdCwgdGhlbiBkZWJ1 Z2ZzIGlzCi0JICogbm90IG1vdW50ZWQgYW5kIHNvIGNhbid0IGNyZWF0ZSB0aGUgcmVsYXkgZmls ZS4KLQkgKiBUaGUgcmVsYXkgQVBJIHNlZW1zIHRvIGZpdCB3ZWxsIHdpdGggZGVidWdmcyBvbmx5 LCBmb3IgYXZhaWxpbmcgcmVsYXkKLQkgKiB0aGVyZSBhcmUgMyByZXF1aXJlbWVudHMgd2hpY2gg Y2FuIGJlIG1ldCBmb3IgZGVidWdmcyBmaWxlIG9ubHkgaW4gYQotCSAqIHN0cmFpZ2h0Zm9yd2Fy ZC9jbGVhbiBtYW5uZXIgOi0KLQkgKiBpKSAgIE5lZWQgdGhlIGFzc29jaWF0ZWQgZGVudHJ5IHBv aW50ZXIgb2YgdGhlIGZpbGUsIHdoaWxlIG9wZW5pbmcgdGhlCi0JICogICAgICByZWxheSBjaGFu bmVsLgotCSAqIGlpKSAgU2hvdWxkIGJlIGFibGUgdG8gdXNlICdyZWxheV9maWxlX29wZXJhdGlv bnMnIGZvcHMgZm9yIHRoZSBmaWxlLgotCSAqIGlpaSkgU2V0IHRoZSAnaV9wcml2YXRlJyBmaWVs ZCBvZiBmaWxlJ3MgaW5vZGUgdG8gdGhlIHBvaW50ZXIgb2YKLQkgKglyZWxheSBjaGFubmVsIGJ1 ZmZlci4KLQkgKi8KLQlpZiAoIWxvZ19kaXIpIHsKLQkJRFJNX0VSUk9SKCJEZWJ1Z2ZzIGRpciBu b3QgYXZhaWxhYmxlIHlldCBmb3IgR3VDIGxvZyBmaWxlXG4iKTsKLQkJcmV0dXJuIC1FTk9ERVY7 Ci0JfQotCi0JcmV0ID0gcmVsYXlfbGF0ZV9zZXR1cF9maWxlcyhsb2ctPnJ1bnRpbWUucmVsYXlf Y2hhbiwgImd1Y19sb2ciLAotCQkJCSAgICAgbG9nX2Rpcik7Ci0JaWYgKHJldCA8IDAgJiYgcmV0 ICE9IC1FRVhJU1QpIHsKLQkJRFJNX0VSUk9SKCJDb3VsZG4ndCBhc3NvY2lhdGUgcmVsYXkgY2hh biB3aXRoIGZpbGUgJWRcbiIsIHJldCk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCi0JcmV0dXJuIDA7 Ci19Ci0KIHN0YXRpYyB2b2lkIGd1Y19tb3ZlX3RvX25leHRfYnVmKHN0cnVjdCBpbnRlbF9ndWNf bG9nICpsb2cpCiB7CiAJLyoKQEAgLTQ2MSwxMyArNDE1LDEwIEBAIHN0YXRpYyBpbnQgZ3VjX2xv Z19yZWxheV9jcmVhdGUoc3RydWN0IGludGVsX2d1Y19sb2cgKmxvZykKIAkgKi8KIAluX3N1YmJ1 ZnMgPSA4OwogCi0JLyoKLQkgKiBDcmVhdGUgYSByZWxheSBjaGFubmVsLCBzbyB0aGF0IHdlIGhh dmUgYnVmZmVycyBmb3Igc3RvcmluZwotCSAqIHRoZSBHdUMgZmlybXdhcmUgbG9ncywgdGhlIGNo YW5uZWwgd2lsbCBiZSBsaW5rZWQgd2l0aCBhIGZpbGUKLQkgKiBsYXRlciBvbiB3aGVuIGRlYnVn ZnMgaXMgcmVnaXN0ZXJlZC4KLQkgKi8KLQlndWNfbG9nX3JlbGF5X2NoYW4gPSByZWxheV9vcGVu KE5VTEwsIE5VTEwsIHN1YmJ1Zl9zaXplLAotCQkJCQluX3N1YmJ1ZnMsICZyZWxheV9jYWxsYmFj a3MsIGRldl9wcml2KTsKKwlndWNfbG9nX3JlbGF5X2NoYW4gPSByZWxheV9vcGVuKCJndWNfbG9n IiwKKwkJCQkJZGV2X3ByaXYtPmRybS5wcmltYXJ5LT5kZWJ1Z2ZzX3Jvb3QsCisJCQkJCXN1YmJ1 Zl9zaXplLCBuX3N1YmJ1ZnMsCisJCQkJCSZyZWxheV9jYWxsYmFja3MsIGRldl9wcml2KTsKIAlp ZiAoIWd1Y19sb2dfcmVsYXlfY2hhbikgewogCQlEUk1fRVJST1IoIkNvdWxkbid0IGNyZWF0ZSBy ZWxheSBjaGFuIGZvciBHdUMgbG9nZ2luZ1xuIik7CiAKQEAgLTY2OCwxOCArNjE5LDEyIEBAIGlu dCBpbnRlbF9ndWNfbG9nX3JlZ2lzdGVyKHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpCiAJaWYg KHJldCkKIAkJZ290byBlcnJfcmVsYXk7CiAKLQlyZXQgPSBndWNfbG9nX3JlbGF5X2ZpbGVfY3Jl YXRlKGxvZyk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfdW5tYXA7Ci0KIAlndWNfZmx1c2hfbG9n X21zZ19lbmFibGUobG9nX3RvX2d1Yyhsb2cpKTsKIAogCW11dGV4X3VubG9jaygmbG9nLT5ydW50 aW1lLmxvY2spOwogCiAJcmV0dXJuIDA7CiAKLWVycl91bm1hcDoKLQlndWNfbG9nX3VubWFwKGxv Zyk7CiBlcnJfcmVsYXk6CiAJZ3VjX2xvZ19yZWxheV9kZXN0cm95KGxvZyk7CiBlcnI6Ci0tIAoy LjE0LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=