From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 17/29] drm/i915: Convert trace functions from seqno to request Date: Thu, 30 Oct 2014 18:41:09 +0000 Message-ID: <1414694481-15724-18-git-send-email-John.C.Harrison@Intel.com> References: <1414694481-15724-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 568096E593 for ; Thu, 30 Oct 2014 11:41:45 -0700 (PDT) In-Reply-To: <1414694481-15724-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFsbCB0aGUg Y29kZSBhYm92ZSBpcyBub3cgdXNpbmcgcmVxdWVzdHMgbm90IHNlcW5vcyBzbyBpdCBpcyBwb3Nz aWJsZSB0byBjb252ZXJ0CnRoZSB0cmFjZSBmdW5jdGlvbnMgYWNyb3NzLiBOb3RlIHRoYXQgcmF0 aGVyIHRoYW4gZ2V0IGludG8gcHJvYmxlbWF0aWMgcmVmZXJlbmNlCmNvdW50aW5nIGlzc3Vlcywg dGhlIHRyYWNlIGNvZGUgb25seSBzYXZlcyB0aGUgc2Vxbm8gYW5kIHJpbmcgdmFsdWVzIGZyb20g dGhlCnJlcXVlc3Qgc3RydWN0dXJlIG5vdCB0aGUgc3RydWN0dXJlIHBvaW50ZXIgaXRzZWxmLgoK Rm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlz b25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAg ICAgICB8ICAgMTAgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmggICAgICAg ICAgfCAgIDQ3ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg MzMgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK aW5kZXggZTRjYjI1My4uNzc0YWI5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xMTg0 LDcgKzExODQsNyBAQCBzdGF0aWMgaW50IF9fd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxLAogCQlyZXR1cm4gLUVOT0RFVjsKIAogCS8qIFJlY29yZCBjdXJyZW50 IHRpbWUgaW4gY2FzZSBpbnRlcnJ1cHRlZCBieSBzaWduYWwsIG9yIHdlZGdlZCAqLwotCXRyYWNl X2k5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbihpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKHJl cSksIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSkpOworCXRyYWNlX2k5MTVfZ2VtX3Jl cXVlc3Rfd2FpdF9iZWdpbihyZXEpOwogCWJlZm9yZSA9IGt0aW1lX2dldF9yYXdfbnMoKTsKIAlm b3IgKDs7KSB7CiAJCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOwpAQCAtMTIzNSw3ICsxMjM1LDcg QEAgc3RhdGljIGludCBfX3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKIAkJfQogCX0KIAlub3cgPSBrdGltZV9nZXRfcmF3X25zKCk7Ci0JdHJhY2VfaTkxNV9n ZW1fcmVxdWVzdF93YWl0X2VuZChpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKHJlcSksIGk5MTVf Z2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSkpOworCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfd2Fp dF9lbmQocmVxKTsKIAogCWlmICghaXJxX3Rlc3RfaW5fcHJvZ3Jlc3MpCiAJCXJpbmctPmlycV9w dXQocmluZyk7CkBAIC0yNDE2LDcgKzI0MTYsNyBAQCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXNwaW5fdW5sb2NrKCZmaWxlX3ByaXYtPm1t LmxvY2spOwogCX0KIAotCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3RfYWRkKHJpbmcsIHJlcXVlc3Qt PnNlcW5vKTsKKwl0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0X2FkZChyZXF1ZXN0KTsKIAlyaW5nLT5v dXRzdGFuZGluZ19sYXp5X3JlcXVlc3QgPSBOVUxMOwogCiAJaWYgKCFkZXZfcHJpdi0+dW1zLm1t X3N1c3BlbmRlZCkgewpAQCAtMjY5MSw3ICsyNjkxLDcgQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVl c3RzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJaWYgKCFpOTE1X3NlcW5v X3Bhc3NlZChzZXFubywgcmVxdWVzdC0+c2Vxbm8pKQogCQkJYnJlYWs7CiAKLQkJdHJhY2VfaTkx NV9nZW1fcmVxdWVzdF9yZXRpcmUocmluZywgcmVxdWVzdC0+c2Vxbm8pOworCQl0cmFjZV9pOTE1 X2dlbV9yZXF1ZXN0X3JldGlyZShyZXF1ZXN0KTsKIAogCQkvKiBUaGlzIGlzIG9uZSBvZiB0aGUg ZmV3IGNvbW1vbiBpbnRlcnNlY3Rpb24gcG9pbnRzCiAJCSAqIGJldHdlZW4gbGVnYWN5IHJpbmdi dWZmZXIgc3VibWlzc2lvbiBhbmQgZXhlY2xpc3RzOgpAQCAtMjkyNyw3ICsyOTI3LDcgQEAgaTkx NV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCi0JdHJhY2VfaTkxNV9nZW1fcmluZ19zeW5jX3RvKGZyb20s IHRvLCBzZXFubyk7CisJdHJhY2VfaTkxNV9nZW1fcmluZ19zeW5jX3RvKGZyb20sIHRvLCBvYmot Pmxhc3RfcmVhZF9yZXEpOwogCXJldCA9IHRvLT5zZW1hcGhvcmUuc3luY190byh0bywgZnJvbSwg c2Vxbm8pOwogCWlmICghcmV0KQogCQkvKiBXZSB1c2UgbGFzdF9yZWFkX3JlcSBiZWNhdXNlIHN5 bmNfdG8oKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4 IDQyMTIzNjUuLjUzMmNhMGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKQEAgLTExNjcsNyArMTE2Nyw3IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlz c2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQly ZXR1cm4gcmV0OwogCX0KIAotCXRyYWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2gocmluZywgaTkx NV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8oaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSksIGZs YWdzKTsKKwl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKGludGVsX3JpbmdfZ2V0X3JlcXVl c3QocmluZyksIGZsYWdzKTsKIAogCWk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19hY3RpdmUo dm1hcywgcmluZyk7CiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoZGV2LCBm aWxlLCByaW5nLCBiYXRjaF9vYmopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV90cmFjZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IGY1 YWEwMDYuLjY2NjE2ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJh Y2UuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTMyOCw4ICsz MjgsOCBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9ldmljdF92bSwKIFRSQUNFX0VWRU5UKGk5MTVf Z2VtX3Jpbmdfc3luY190bywKIAkgICAgVFBfUFJPVE8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZnJvbSwKIAkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp0bywKLQkJICAgICB1MzIgc2Vx bm8pLAotCSAgICBUUF9BUkdTKGZyb20sIHRvLCBzZXFubyksCisJCSAgICAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpLAorCSAgICBUUF9BUkdTKGZyb20sIHRvLCByZXEpLAogCiAJ ICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAgIF9fZmllbGQodTMyLCBkZXYpCkBAIC0zNDIs NyArMzQyLDcgQEAgVFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmluZ19zeW5jX3RvLAogCQkJICAgX19l bnRyeS0+ZGV2ID0gZnJvbS0+ZGV2LT5wcmltYXJ5LT5pbmRleDsKIAkJCSAgIF9fZW50cnktPnN5 bmNfZnJvbSA9IGZyb20tPmlkOwogCQkJICAgX19lbnRyeS0+c3luY190byA9IHRvLT5pZDsKLQkJ CSAgIF9fZW50cnktPnNlcW5vID0gc2Vxbm87CisJCQkgICBfX2VudHJ5LT5zZXFubyA9IGk5MTVf Z2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSk7CiAJCQkgICApLAogCiAJICAgIFRQX3ByaW50aygi ZGV2PSV1LCBzeW5jLWZyb209JXUsIHN5bmMtdG89JXUsIHNlcW5vPSV1IiwKQEAgLTM1Miw4ICsz NTIsOCBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9yaW5nX3N5bmNfdG8sCiApOwogCiBUUkFDRV9F VkVOVChpOTE1X2dlbV9yaW5nX2Rpc3BhdGNoLAotCSAgICBUUF9QUk9UTyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8sIHUzMiBmbGFncyksCi0JICAgIFRQX0FSR1Mocmlu Zywgc2Vxbm8sIGZsYWdzKSwKKwkgICAgVFBfUFJPVE8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEsIHUzMiBmbGFncyksCisJICAgIFRQX0FSR1MocmVxLCBmbGFncyksCiAKIAkgICAg VFBfU1RSVUNUX19lbnRyeSgKIAkJCSAgICAgX19maWVsZCh1MzIsIGRldikKQEAgLTM2MywxMSAr MzYzLDEzIEBAIFRSQUNFX0VWRU5UKGk5MTVfZ2VtX3JpbmdfZGlzcGF0Y2gsCiAJCQkgICAgICks CiAKIAkgICAgVFBfZmFzdF9hc3NpZ24oCisJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nID0KKwkJCQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAkJCSAgIF9fZW50 cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5yaW5n ID0gcmluZy0+aWQ7Ci0JCQkgICBfX2VudHJ5LT5zZXFubyA9IHNlcW5vOworCQkJICAgX19lbnRy eS0+c2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCQkJICAgX19lbnRy eS0+ZmxhZ3MgPSBmbGFnczsKLQkJCSAgIGk5MTVfdHJhY2VfaXJxX2dldChyaW5nLCBzZXFubyk7 CisJCQkgICBpOTE1X3RyYWNlX2lycV9nZXQocmluZywgX19lbnRyeS0+c2Vxbm8pOwogCQkJICAg KSwKIAogCSAgICBUUF9wcmludGsoImRldj0ldSwgcmluZz0ldSwgc2Vxbm89JXUsIGZsYWdzPSV4 IiwKQEAgLTM5OCw4ICs0MDAsOCBAQCBUUkFDRV9FVkVOVChpOTE1X2dlbV9yaW5nX2ZsdXNoLAog KTsKIAogREVDTEFSRV9FVkVOVF9DTEFTUyhpOTE1X2dlbV9yZXF1ZXN0LAotCSAgICBUUF9QUk9U TyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8pLAotCSAgICBUUF9BUkdT KHJpbmcsIHNlcW5vKSwKKwkgICAgVFBfUFJPVE8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEpLAorCSAgICBUUF9BUkdTKHJlcSksCiAKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgKIAkJ CSAgICAgX19maWVsZCh1MzIsIGRldikKQEAgLTQwOCw5ICs0MTAsMTEgQEAgREVDTEFSRV9FVkVO VF9DTEFTUyhpOTE1X2dlbV9yZXF1ZXN0LAogCQkJICAgICApLAogCiAJICAgIFRQX2Zhc3RfYXNz aWduKAorCQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9CisJCQkJCQlpOTE1X2dl bV9yZXF1ZXN0X2dldF9yaW5nKHJlcSk7CiAJCQkgICBfX2VudHJ5LT5kZXYgPSByaW5nLT5kZXYt PnByaW1hcnktPmluZGV4OwogCQkJICAgX19lbnRyeS0+cmluZyA9IHJpbmctPmlkOwotCQkJICAg X19lbnRyeS0+c2Vxbm8gPSBzZXFubzsKKwkJCSAgIF9fZW50cnktPnNlcW5vID0gaTkxNV9nZW1f cmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKIAkJCSAgICksCiAKIAkgICAgVFBfcHJpbnRrKCJkZXY9 JXUsIHJpbmc9JXUsIHNlcW5vPSV1IiwKQEAgLTQxOCw4ICs0MjIsOCBAQCBERUNMQVJFX0VWRU5U X0NMQVNTKGk5MTVfZ2VtX3JlcXVlc3QsCiApOwogCiBERUZJTkVfRVZFTlQoaTkxNV9nZW1fcmVx dWVzdCwgaTkxNV9nZW1fcmVxdWVzdF9hZGQsCi0JICAgIFRQX1BST1RPKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubyksCi0JICAgIFRQX0FSR1MocmluZywgc2Vxbm8pCisJ ICAgIFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKSwKKwkgICAgVFBf QVJHUyhyZXEpCiApOwogCiBUUkFDRV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlLApA QCAtNDQzLDEzICs0NDcsMTMgQEAgVFJBQ0VfRVZFTlQoaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0 ZSwKICk7CiAKIERFRklORV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0LCBpOTE1X2dlbV9yZXF1ZXN0 X3JldGlyZSwKLQkgICAgVFBfUFJPVE8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMy IHNlcW5vKSwKLQkgICAgVFBfQVJHUyhyaW5nLCBzZXFubykKKwkgICAgVFBfUFJPVE8oc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpLAorCSAgICBUUF9BUkdTKHJlcSkKICk7CiAKIFRS QUNFX0VWRU5UKGk5MTVfZ2VtX3JlcXVlc3Rfd2FpdF9iZWdpbiwKLQkgICAgVFBfUFJPVE8oc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNlcW5vKSwKLQkgICAgVFBfQVJHUyhyaW5n LCBzZXFubyksCisJICAgIFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KSwKKwkgICAgVFBfQVJHUyhyZXEpLAogCiAJICAgIFRQX1NUUlVDVF9fZW50cnkoCiAJCQkgICAg IF9fZmllbGQodTMyLCBkZXYpCkBAIC00NjUsMTAgKzQ2OSwxMyBAQCBUUkFDRV9FVkVOVChpOTE1 X2dlbV9yZXF1ZXN0X3dhaXRfYmVnaW4sCiAJICAgICAqIGxlc3MgZGVzaXJhYmxlLgogCSAgICAg Ki8KIAkgICAgVFBfZmFzdF9hc3NpZ24oCisJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nID0KKwkJCQkJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAkJCSAgIF9fZW50 cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7CiAJCQkgICBfX2VudHJ5LT5yaW5n ID0gcmluZy0+aWQ7Ci0JCQkgICBfX2VudHJ5LT5zZXFubyA9IHNlcW5vOwotCQkJICAgX19lbnRy eS0+YmxvY2tpbmcgPSBtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KTsK KwkJCSAgIF9fZW50cnktPnNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsK KwkJCSAgIF9fZW50cnktPmJsb2NraW5nID0KKwkJCQkgICAgIG11dGV4X2lzX2xvY2tlZCgmcmlu Zy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCQkJICAgKSwKIAogCSAgICBUUF9wcmludGsoImRldj0l dSwgcmluZz0ldSwgc2Vxbm89JXUsIGJsb2NraW5nPSVzIiwKQEAgLTQ3Nyw4ICs0ODQsOCBAQCBU UkFDRV9FVkVOVChpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfYmVnaW4sCiApOwogCiBERUZJTkVfRVZF TlQoaTkxNV9nZW1fcmVxdWVzdCwgaTkxNV9nZW1fcmVxdWVzdF93YWl0X2VuZCwKLQkgICAgVFBf UFJPVE8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNlcW5vKSwKLQkgICAgVFBf QVJHUyhyaW5nLCBzZXFubykKKwkgICAgVFBfUFJPVE8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpLAorCSAgICBUUF9BUkdTKHJlcSkKICk7CiAKIERFQ0xBUkVfRVZFTlRfQ0xBU1Mo aTkxNV9yaW5nLAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK