From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t v2 2/2] intel_gpu_overlay: Update for class:instance engine tracepoints Date: Wed, 6 Jun 2018 10:02:33 +0100 Message-ID: <20180606090233.6646-1-tvrtko.ursulin@linux.intel.com> References: <152822764202.9058.18039377220321146761@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1227E6E61B for ; Wed, 6 Jun 2018 09:02:41 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id k16-v6so5411219wro.0 for ; Wed, 06 Jun 2018 02:02:40 -0700 (PDT) In-Reply-To: <152822764202.9058.18039377220321146761@mail.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgbWltaW5h bCBoYWNrIHRvIHBhcnNlIHRoZSBuZXcgdHJhY2Vwb2ludCBmb3JtYXQgYW5kIGludmVudCBuZXcg InJpbmcKaWQncyIgYmFzZWQgb24gZW5naW5lIGNsYXNzIGFuZCBpbnN0YW5jZS4KCnYyOgogKiBN YWtlIGl0IGEgYml0IG1vcmUgZnV0dXJlIHByb29mLiAoTGlvbmVsLCBDaHJpcykKICogU29tZSBh c3NvcnRlZCBmaXh1cHMgdG8gc2hvdyBmb3Jnb3R0ZW4gZW5naW5lcy4KClNpZ25lZC1vZmYtYnk6 IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBMaW9uZWwgTGFu ZHdlcmxpbiA8bGlvbmVsLmcubGFuZHdlcmxpbkBpbnRlbC5jb20+Ci0tLQogb3ZlcmxheS9ncHUt cGVyZi5jIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogb3Zl cmxheS9vdmVybGF5LmMgIHwgMTcgKysrKysrKysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg NDEgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvb3ZlcmxheS9n cHUtcGVyZi5jIGIvb3ZlcmxheS9ncHUtcGVyZi5jCmluZGV4IGVhMzQ4MDA1MGFiOS4uNTYyOWY4 MjY3NjVlIDEwMDY0NAotLS0gYS9vdmVybGF5L2dwdS1wZXJmLmMKKysrIGIvb3ZlcmxheS9ncHUt cGVyZi5jCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8 ZmNudGwuaD4KICNpbmNsdWRlIDxlcnJuby5oPgorI2luY2x1ZGUgPGFzc2VydC5oPgogCiAjaW5j bHVkZSAiaWd0X3BlcmYuaCIKIApAQCAtODUsNyArODYsOCBAQCBzdHJ1Y3QgdHJhY2Vwb2ludCB7 CiAKIAlpbnQgZGV2aWNlX2ZpZWxkOwogCWludCBjdHhfZmllbGQ7Ci0JaW50IHJpbmdfZmllbGQ7 CisJaW50IGNsYXNzX2ZpZWxkOworCWludCBpbnN0YW5jZV9maWVsZDsKIAlpbnQgc2Vxbm9fZmll bGQ7CiAJaW50IGdsb2JhbF9zZXFub19maWVsZDsKIAlpbnQgcGxhbmVfZmllbGQ7CkBAIC0xNTEs OCArMTUzLDEwIEBAIHRyYWNlcG9pbnRfaWQoaW50IHRwX2lkKQogCQkJCXRwLT5kZXZpY2VfZmll bGQgPSBmOwogCQkJfSBlbHNlIGlmICghc3RyY21wKHRwLT5maWVsZHNbZl0ubmFtZSwgImN0eCIp KSB7CiAJCQkJdHAtPmN0eF9maWVsZCA9IGY7Ci0JCQl9IGVsc2UgaWYgKCFzdHJjbXAodHAtPmZp ZWxkc1tmXS5uYW1lLCAicmluZyIpKSB7Ci0JCQkJdHAtPnJpbmdfZmllbGQgPSBmOworCQkJfSBl bHNlIGlmICghc3RyY21wKHRwLT5maWVsZHNbZl0ubmFtZSwgImNsYXNzIikpIHsKKwkJCQl0cC0+ Y2xhc3NfZmllbGQgPSBmOworCQkJfSBlbHNlIGlmICghc3RyY21wKHRwLT5maWVsZHNbZl0ubmFt ZSwgImluc3RhbmNlIikpIHsKKwkJCQl0cC0+aW5zdGFuY2VfZmllbGQgPSBmOwogCQkJfSBlbHNl IGlmICghc3RyY21wKHRwLT5maWVsZHNbZl0ubmFtZSwgInNlcW5vIikpIHsKIAkJCQl0cC0+c2Vx bm9fZmllbGQgPSBmOwogCQkJfSBlbHNlIGlmICghc3RyY21wKHRwLT5maWVsZHNbZl0ubmFtZSwg Imdsb2JhbF9zZXFubyIpKSB7CkBAIC0xNzUsNiArMTc5LDI2IEBAIHRyYWNlcG9pbnRfaWQoaW50 IHRwX2lkKQogCQkJICAgICB0cmFjZXBvaW50c1t0cF9pZF0uZmllbGRzWwkJCVwKIAkJCQkgICAg IHRyYWNlcG9pbnRzW3RwX2lkXS5maWVsZF9uYW1lIyNfZmllbGRdLm9mZnNldCkpCiAKKyNkZWZp bmUgUkVBRF9UUF9GSUVMRF9VMTYoc2FtcGxlLCB0cF9pZCwgZmllbGRfbmFtZSkJCQlcCisJKCoo Y29uc3QgdWludDE2X3QgKikoKHNhbXBsZSktPnRyYWNlcG9pbnRfZGF0YSArCQlcCisJCQkgICAg IHRyYWNlcG9pbnRzW3RwX2lkXS5maWVsZHNbCQkJXAorCQkJCSAgICAgdHJhY2Vwb2ludHNbdHBf aWRdLmZpZWxkX25hbWUjI19maWVsZF0ub2Zmc2V0KSkKKworI2RlZmluZSBHRVRfUklOR19JRChz YW1wbGUsIHRwX2lkKSBcCisoeyBcCisJdW5zaWduZWQgY2hhciBjbGFzcywgaW5zdGFuY2UsIHJp bmc7IFwKK1wKKwljbGFzcyA9IFJFQURfVFBfRklFTERfVTE2KHNhbXBsZSwgdHBfaWQsIGNsYXNz KTsgXAorCWluc3RhbmNlID0gUkVBRF9UUF9GSUVMRF9VMTYoc2FtcGxlLCB0cF9pZCwgaW5zdGFu Y2UpOyBcCitcCisJYXNzZXJ0KGNsYXNzIDw9IEk5MTVfRU5HSU5FX0NMQVNTX1ZJREVPX0VOSEFO Q0UpOyBcCisJYXNzZXJ0KGluc3RhbmNlIDw9IDQpOyBcCitcCisJcmluZyA9IGNsYXNzICogNCAr IGluc3RhbmNlOyBcCitcCisJcmluZzsgXAorfSkKKwogc3RhdGljIGludCBwZXJmX3RyYWNlcG9p bnRfb3BlbihzdHJ1Y3QgZ3B1X3BlcmYgKmdwLCBpbnQgdHBfaWQsCiAJCQkJaW50ICgqZnVuYyko c3RydWN0IGdwdV9wZXJmICosIGNvbnN0IHZvaWQgKikpCiB7CkBAIC0zMTMsNyArMzM3LDcgQEAg c3RhdGljIGludCByZXF1ZXN0X2FkZChzdHJ1Y3QgZ3B1X3BlcmYgKmdwLCBjb25zdCB2b2lkICpl dmVudCkKIAlpZiAoY29tbSA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAotCWNvbW0tPm5yX3JlcXVl c3RzW1JFQURfVFBfRklFTERfVTMyKHNhbXBsZSwgVFBfR0VNX1JFUVVFU1RfQURELCByaW5nKV0r KzsKKwljb21tLT5ucl9yZXF1ZXN0c1tHRVRfUklOR19JRChzYW1wbGUsIFRQX0dFTV9SRVFVRVNU X0FERCldKys7CiAJcmV0dXJuIDE7CiB9CiAKQEAgLTMyOSw3ICszNTMsNyBAQCBzdGF0aWMgaW50 IGN0eF9zd2l0Y2goc3RydWN0IGdwdV9wZXJmICpncCwgY29uc3Qgdm9pZCAqZXZlbnQpCiB7CiAJ Y29uc3Qgc3RydWN0IHNhbXBsZV9ldmVudCAqc2FtcGxlID0gZXZlbnQ7CiAKLQlncC0+Y3R4X3N3 aXRjaFtSRUFEX1RQX0ZJRUxEX1UzMihzYW1wbGUsIFRQX0dFTV9SSU5HX1NXSVRDSF9DT05URVhU LCByaW5nKV0rKzsKKwlncC0+Y3R4X3N3aXRjaFtHRVRfUklOR19JRChzYW1wbGUsIFRQX0dFTV9S SU5HX1NXSVRDSF9DT05URVhUKV0rKzsKIAlyZXR1cm4gMTsKIH0KIApAQCAtMzY3LDggKzM5MSw4 IEBAIHN0YXRpYyBpbnQgd2FpdF9iZWdpbihzdHJ1Y3QgZ3B1X3BlcmYgKmdwLCBjb25zdCB2b2lk ICpldmVudCkKIAl3YWl0LT5jb250ZXh0ID0gUkVBRF9UUF9GSUVMRF9VMzIoc2FtcGxlLCBUUF9H RU1fUkVRVUVTVF9XQUlUX0JFR0lOLCBjdHgpOwogCXdhaXQtPnNlcW5vID0gUkVBRF9UUF9GSUVM RF9VMzIoc2FtcGxlLCBUUF9HRU1fUkVRVUVTVF9XQUlUX0JFR0lOLCBzZXFubyk7CiAJd2FpdC0+ dGltZSA9IHNhbXBsZS0+dGltZTsKLQl3YWl0LT5uZXh0ID0gZ3AtPndhaXRbUkVBRF9UUF9GSUVM RF9VMzIoc2FtcGxlLCBUUF9HRU1fUkVRVUVTVF9XQUlUX0JFR0lOLCByaW5nKV07Ci0JZ3AtPndh aXRbUkVBRF9UUF9GSUVMRF9VMzIoc2FtcGxlLCBUUF9HRU1fUkVRVUVTVF9XQUlUX0JFR0lOLCBy aW5nKV0gPSB3YWl0OworCXdhaXQtPm5leHQgPSBncC0+d2FpdFtHRVRfUklOR19JRChzYW1wbGUs IFRQX0dFTV9SRVFVRVNUX1dBSVRfQkVHSU4pXTsKKwlncC0+d2FpdFtHRVRfUklOR19JRChzYW1w bGUsIFRQX0dFTV9SRVFVRVNUX1dBSVRfQkVHSU4pXSA9IHdhaXQ7CiAKIAlyZXR1cm4gMDsKIH0K QEAgLTM3Nyw3ICs0MDEsNyBAQCBzdGF0aWMgaW50IHdhaXRfZW5kKHN0cnVjdCBncHVfcGVyZiAq Z3AsIGNvbnN0IHZvaWQgKmV2ZW50KQogewogCWNvbnN0IHN0cnVjdCBzYW1wbGVfZXZlbnQgKnNh bXBsZSA9IGV2ZW50OwogCXN0cnVjdCBncHVfcGVyZl90aW1lICp3YWl0LCAqKnByZXY7Ci0JdWlu dDMyX3QgZW5naW5lID0gUkVBRF9UUF9GSUVMRF9VMzIoc2FtcGxlLCBUUF9HRU1fUkVRVUVTVF9X QUlUX0VORCwgcmluZyk7CisJdWludDMyX3QgZW5naW5lID0gR0VUX1JJTkdfSUQoc2FtcGxlLCBU UF9HRU1fUkVRVUVTVF9XQUlUX0VORCk7CiAJdWludDMyX3QgY29udGV4dCA9IFJFQURfVFBfRklF TERfVTMyKHNhbXBsZSwgVFBfR0VNX1JFUVVFU1RfV0FJVF9FTkQsIGN0eCk7CiAJdWludDMyX3Qg c2Vxbm8gPSBSRUFEX1RQX0ZJRUxEX1UzMihzYW1wbGUsIFRQX0dFTV9SRVFVRVNUX1dBSVRfRU5E LCBzZXFubyk7CiAKZGlmZiAtLWdpdCBhL292ZXJsYXkvb3ZlcmxheS5jIGIvb3ZlcmxheS9vdmVy bGF5LmMKaW5kZXggNTQ1YWY3YmNiMmY1Li5lYWU1ZGRmYTg4MjMgMTAwNjQ0Ci0tLSBhL292ZXJs YXkvb3ZlcmxheS5jCisrKyBiL292ZXJsYXkvb3ZlcmxheS5jCkBAIC0xNDgsNiArMTQ4LDcgQEAg c3RhdGljIHZvaWQgaW5pdF9ncHVfdG9wKHN0cnVjdCBvdmVybGF5X2NvbnRleHQgKmN0eCwKIAkJ eyAwLjI1LCAxLCAwLjI1LCAxIH0sCiAJCXsgMC4yNSwgMC4yNSwgMSwgMSB9LAogCQl7IDEsIDEs IDEsIDEgfSwKKwkJeyAxLCAxLCAwLjI1LCAxIH0sCiAJfTsKIAlpbnQgbjsKIApAQCAtMzExLDEx ICszMTIsMTEgQEAgc3RhdGljIHZvaWQgc2hvd19ncHVfcGVyZihzdHJ1Y3Qgb3ZlcmxheV9jb250 ZXh0ICpjdHgsIHN0cnVjdCBvdmVybGF5X2dwdV9wZXJmICoKIAkJeyAxLCAxLCAxLCAxIH0sCiAJ fTsKIAlzdHJ1Y3QgZ3B1X3BlcmZfY29tbSAqY29tbSwgKipwcmV2OwotCWNvbnN0IGNoYXIgKnJp bmdfbmFtZVtdID0gewotCQkiUiIsCi0JCSJCIiwKLQkJIlYwIiwKLQkJIlYxIiwKKwljb25zdCBj aGFyICpyaW5nX25hbWVbTUFYX1JJTkdTXSA9IHsKKwkJIlIiLCAiPyIsICI/IiwgIj8iLAorCQki QiIsICI/IiwgIj8iLCAiPyIsCisJCSJWMCIsICJWMSIsICI/IiwgIj8iLAorCQkiVkUwIiwgIj8i LCAiPyIsICI/IiwKIAl9OwogCWRvdWJsZSByYW5nZVsyXTsKIAljaGFyIGJ1ZlsxMDI0XTsKQEAg LTMyNiw3ICszMjcsNyBAQCBzdGF0aWMgdm9pZCBzaG93X2dwdV9wZXJmKHN0cnVjdCBvdmVybGF5 X2NvbnRleHQgKmN0eCwgc3RydWN0IG92ZXJsYXlfZ3B1X3BlcmYgKgogCiAJZ3B1X3BlcmZfdXBk YXRlKCZncC0+Z3B1X3BlcmYpOwogCi0JZm9yIChuID0gMDsgbiA8IDQ7IG4rKykgeworCWZvciAo biA9IDA7IG4gPCBNQVhfUklOR1M7IG4rKykgewogCQlpZiAoZ3AtPmdwdV9wZXJmLmN0eF9zd2l0 Y2hbbl0pCiAJCQloYXNfY3R4ID0gbiArIDE7CiAJCWlmIChncC0+Z3B1X3BlcmYuZmxpcF9jb21w bGV0ZVtuXSkKQEAgLTM4OSw3ICszOTAsNyBAQCBzdGF0aWMgdm9pZCBzaG93X2dwdV9wZXJmKHN0 cnVjdCBvdmVybGF5X2NvbnRleHQgKmN0eCwgc3RydWN0IG92ZXJsYXlfZ3B1X3BlcmYgKgogCQl9 CiAKIAkJdG90YWwgPSAwOwotCQlmb3IgKG4gPSAwOyBuIDwgMzsgbisrKQorCQlmb3IgKG4gPSAw OyBuIDwgTUFYX1JJTkdTOyBuKyspCiAJCQl0b3RhbCArPSBjb21tLT5ucl9yZXF1ZXN0c1tuXTsK IAkJY2hhcnRfYWRkX3NhbXBsZShjb21tLT51c2VyX2RhdGEsIHRvdGFsKTsKIAl9CkBAIC00MzMs NyArNDM0LDcgQEAgc3RhdGljIHZvaWQgc2hvd19ncHVfcGVyZihzdHJ1Y3Qgb3ZlcmxheV9jb250 ZXh0ICpjdHgsIHN0cnVjdCBvdmVybGF5X2dwdV9wZXJmICoKIAkJCWdvdG8gc2tpcF9jb21tOwog CiAJCWxlbiA9IHNwcmludGYoYnVmLCAiJXM6IiwgY29tbS0+bmFtZSk7Ci0JCWZvciAobiA9IDA7 IG4gPCBzaXplb2YocmluZ19uYW1lKS9zaXplb2YocmluZ19uYW1lWzBdKTsgbisrKSB7CisJCWZv ciAobiA9IDA7IG4gPCBNQVhfUklOR1M7IG4rKykgewogCQkJaWYgKGNvbW0tPm5yX3JlcXVlc3Rz W25dID09IDApCiAJCQkJY29udGludWU7CiAJCQlsZW4gKz0gc3ByaW50ZihidWYgKyBsZW4sICIl cyAlZCVzIiwgbmVlZF9jb21tYSA/ICIsIiA6ICIiLCBjb21tLT5ucl9yZXF1ZXN0c1tuXSwgcmlu Z19uYW1lW25dKTsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==