From: Dmitry Rogozhkin Subject: [RFC v2 1/3] drm/i915/pmu: reorder function to suite next patch Date: Wed, 23 Aug 2017 08:26:01 -0700 Message-ID: <1503501963-24136-2-git-send-email-dmitry.v.rogozhkin@intel.com> References: <1503501963-24136-1-git-send-email-dmitry.v.rogozhkin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65A876E0B3 for ; Wed, 23 Aug 2017 23:28:44 +0000 (UTC) In-Reply-To: <1503501963-24136-1-git-send-email-dmitry.v.rogozhkin@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 Cc: Peter Zijlstra List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBpcyBkb2luZyBub3ZlciBleGNlcHQgcmVvcmRlcmluZyBmdW5jdGlvbnMgdG8g aGlnaGxpZ2h0CmNoYW5nZXMgaW4gdGhlIG5leHQgcGF0Y2guCgpDaGFuZ2UtSWQ6IEkwY2QyOTg3 ODA1MDNhZThmNmY4MDM1Yjg2YzU5ZmM4YjUxOTEzNTZiClNpZ25lZC1vZmYtYnk6IERtaXRyeSBS b2dvemhraW4gPGRtaXRyeS52LnJvZ296aGtpbkBpbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogUGV0ZXIgWmlqbHN0cmEgPHBldGVyekBp bmZyYWRlYWQub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgfCAxODAg KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDkwIGluc2VydGlvbnMoKyksIDkwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5j CmluZGV4IDMyNzJlYzAuLmJjZGYyYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcG11LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwpAQCAtMzYz LDYgKzM2Myw4OCBAQCBzdGF0aWMgYm9vbCBlbmdpbmVfbmVlZHNfYnVzeV9zdGF0cyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJICAgICAgIChlbmdpbmUtPnBtdS5lbmFibGUgJiBC SVQoSTkxNV9TQU1QTEVfQlVTWSkpOwogfQogCitzdGF0aWMgdTY0IGNvdW50X2ludGVycnVwdHMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCit7CisJLyogb3Blbi1jb2RlZCBrc3RhdF9p cnFzKCkgKi8KKwlzdHJ1Y3QgaXJxX2Rlc2MgKmRlc2MgPSBpcnFfdG9fZGVzYyhpOTE1LT5kcm0u cGRldi0+aXJxKTsKKwl1NjQgc3VtID0gMDsKKwlpbnQgY3B1OworCisJaWYgKCFkZXNjIHx8ICFk ZXNjLT5rc3RhdF9pcnFzKQorCQlyZXR1cm4gMDsKKworCWZvcl9lYWNoX3Bvc3NpYmxlX2NwdShj cHUpCisJCXN1bSArPSAqcGVyX2NwdV9wdHIoZGVzYy0+a3N0YXRfaXJxcywgY3B1KTsKKworCXJl dHVybiBzdW07Cit9CisKK3N0YXRpYyB2b2lkIGk5MTVfcG11X2V2ZW50X3JlYWQoc3RydWN0IHBl cmZfZXZlbnQgKmV2ZW50KQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KKwkJ Y29udGFpbmVyX29mKGV2ZW50LT5wbXUsIHR5cGVvZigqaTkxNSksIHBtdS5iYXNlKTsKKwl1NjQg dmFsID0gMDsKKworCWlmIChpc19lbmdpbmVfZXZlbnQoZXZlbnQpKSB7CisJCXU4IHNhbXBsZSA9 IGVuZ2luZV9ldmVudF9zYW1wbGUoZXZlbnQpOworCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmU7CisKKwkJZW5naW5lID0gaW50ZWxfZW5naW5lX2xvb2t1cF91c2VyKGk5MTUsCisJCQkJ CQkgIGVuZ2luZV9ldmVudF9jbGFzcyhldmVudCksCisJCQkJCQkgIGVuZ2luZV9ldmVudF9pbnN0 YW5jZShldmVudCkpOworCisJCWlmIChXQVJOX09OX09OQ0UoIWVuZ2luZSkpIHsKKwkJCS8qIERv IG5vdGhpbmcgKi8KKwkJfSBlbHNlIGlmIChzYW1wbGUgPT0gSTkxNV9TQU1QTEVfQlVTWSAmJgor CQkJICAgZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgeworCQkJdmFsID0ga3RpbWVfdG9fbnMoaW50 ZWxfZW5naW5lX2dldF9idXN5X3RpbWUoZW5naW5lKSk7CisJCX0gZWxzZSB7CisJCQl2YWwgPSBl bmdpbmUtPnBtdS5zYW1wbGVbc2FtcGxlXTsKKwkJfQorCX0gZWxzZSBzd2l0Y2ggKGV2ZW50LT5h dHRyLmNvbmZpZykgeworCWNhc2UgSTkxNV9QTVVfQUNUVUFMX0ZSRVFVRU5DWToKKwkJdmFsID0g aTkxNS0+cG11LnNhbXBsZVtfX0k5MTVfU0FNUExFX0ZSRVFfQUNUXTsKKwkJYnJlYWs7CisJY2Fz ZSBJOTE1X1BNVV9SRVFVRVNURURfRlJFUVVFTkNZOgorCQl2YWwgPSBpOTE1LT5wbXUuc2FtcGxl W19fSTkxNV9TQU1QTEVfRlJFUV9SRVFdOworCQlicmVhazsKKwljYXNlIEk5MTVfUE1VX0VORVJH WToKKwkJdmFsID0gaW50ZWxfZW5lcmd5X3VKKGk5MTUpOworCQlicmVhazsKKwljYXNlIEk5MTVf UE1VX0lOVEVSUlVQVFM6CisJCXZhbCA9IGNvdW50X2ludGVycnVwdHMoaTkxNSk7CisJCWJyZWFr OworCisJY2FzZSBJOTE1X1BNVV9SQzZfUkVTSURFTkNZOgorCQlpZiAoIWk5MTUtPmd0LmF3YWtl KQorCQkJcmV0dXJuOworCisJCXZhbCA9IGludGVsX3JjNl9yZXNpZGVuY3lfbnMoaTkxNSwKKwkJ CQkJICAgICBJU19WQUxMRVlWSUVXKGk5MTUpID8KKwkJCQkJICAgICBWTFZfR1RfUkVOREVSX1JD NiA6CisJCQkJCSAgICAgR0VONl9HVF9HRlhfUkM2KTsKKwkJYnJlYWs7CisKKwljYXNlIEk5MTVf UE1VX1JDNnBfUkVTSURFTkNZOgorCQlpZiAoIWk5MTUtPmd0LmF3YWtlKQorCQkJcmV0dXJuOwor CisJCWlmICghSVNfVkFMTEVZVklFVyhpOTE1KSkKKwkJCXZhbCA9IGludGVsX3JjNl9yZXNpZGVu Y3lfbnMoaTkxNSwgR0VONl9HVF9HRlhfUkM2cCk7CisJCWJyZWFrOworCisJY2FzZSBJOTE1X1BN VV9SQzZwcF9SRVNJREVOQ1k6CisJCWlmICghaTkxNS0+Z3QuYXdha2UpCisJCQlyZXR1cm47CisK KwkJaWYgKCFJU19WQUxMRVlWSUVXKGk5MTUpKQorCQkJdmFsID0gaW50ZWxfcmM2X3Jlc2lkZW5j eV9ucyhpOTE1LCBHRU42X0dUX0dGWF9SQzZwcCk7CisJCWJyZWFrOworCX0KKworCWxvY2FsNjRf c2V0KCZldmVudC0+Y291bnQsIHZhbCk7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfcG11X2VuYWJs ZShzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUgPQpAQCAtNDQwLDIzICs1MjIsNiBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9kaXNhYmxl KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlpOTE1X3BtdV90aW1lcl9jYW5jZWwoZXZlbnQp OwogfQogCi1zdGF0aWMgaW50IGk5MTVfcG11X2V2ZW50X2FkZChzdHJ1Y3QgcGVyZl9ldmVudCAq ZXZlbnQsIGludCBmbGFncykKLXsKLQlzdHJ1Y3QgaHdfcGVyZl9ldmVudCAqaHdjID0gJmV2ZW50 LT5odzsKLQotCWlmIChmbGFncyAmIFBFUkZfRUZfU1RBUlQpCi0JCWk5MTVfcG11X2VuYWJsZShl dmVudCk7Ci0KLQlod2MtPnN0YXRlID0gIShmbGFncyAmIFBFUkZfRUZfU1RBUlQpOwotCi0JcmV0 dXJuIDA7Ci19Ci0KLXN0YXRpYyB2b2lkIGk5MTVfcG11X2V2ZW50X2RlbChzdHJ1Y3QgcGVyZl9l dmVudCAqZXZlbnQsIGludCBmbGFncykKLXsKLQlpOTE1X3BtdV9kaXNhYmxlKGV2ZW50KTsKLX0K LQogc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZlbnRfc3RhcnQoc3RydWN0IHBlcmZfZXZlbnQgKmV2 ZW50LCBpbnQgZmxhZ3MpCiB7CiAJaTkxNV9wbXVfZW5hYmxlKGV2ZW50KTsKQEAgLTQ2Nyw4NiAr NTMyLDIxIEBAIHN0YXRpYyB2b2lkIGk5MTVfcG11X2V2ZW50X3N0b3Aoc3RydWN0IHBlcmZfZXZl bnQgKmV2ZW50LCBpbnQgZmxhZ3MpCiAJaTkxNV9wbXVfZGlzYWJsZShldmVudCk7CiB9CiAKLXN0 YXRpYyB1NjQgY291bnRfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkK K3N0YXRpYyBpbnQgaTkxNV9wbXVfZXZlbnRfYWRkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCwg aW50IGZsYWdzKQogewotCS8qIG9wZW4tY29kZWQga3N0YXRfaXJxcygpICovCi0Jc3RydWN0IGly cV9kZXNjICpkZXNjID0gaXJxX3RvX2Rlc2MoaTkxNS0+ZHJtLnBkZXYtPmlycSk7Ci0JdTY0IHN1 bSA9IDA7Ci0JaW50IGNwdTsKKwlzdHJ1Y3QgaHdfcGVyZl9ldmVudCAqaHdjID0gJmV2ZW50LT5o dzsKIAotCWlmICghZGVzYyB8fCAhZGVzYy0+a3N0YXRfaXJxcykKLQkJcmV0dXJuIDA7CisJaWYg KGZsYWdzICYgUEVSRl9FRl9TVEFSVCkKKwkJaTkxNV9wbXVfZW5hYmxlKGV2ZW50KTsKIAotCWZv cl9lYWNoX3Bvc3NpYmxlX2NwdShjcHUpCi0JCXN1bSArPSAqcGVyX2NwdV9wdHIoZGVzYy0+a3N0 YXRfaXJxcywgY3B1KTsKKwlod2MtPnN0YXRlID0gIShmbGFncyAmIFBFUkZfRUZfU1RBUlQpOwog Ci0JcmV0dXJuIHN1bTsKKwlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZl bnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCitzdGF0aWMgdm9pZCBpOTE1X3BtdV9l dmVudF9kZWwoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50LCBpbnQgZmxhZ3MpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPQotCQljb250YWluZXJfb2YoZXZlbnQtPnBtdSwgdHlw ZW9mKCppOTE1KSwgcG11LmJhc2UpOwotCXU2NCB2YWwgPSAwOwotCi0JaWYgKGlzX2VuZ2luZV9l dmVudChldmVudCkpIHsKLQkJdTggc2FtcGxlID0gZW5naW5lX2V2ZW50X3NhbXBsZShldmVudCk7 Ci0JCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKLQotCQllbmdpbmUgPSBpbnRlbF9l bmdpbmVfbG9va3VwX3VzZXIoaTkxNSwKLQkJCQkJCSAgZW5naW5lX2V2ZW50X2NsYXNzKGV2ZW50 KSwKLQkJCQkJCSAgZW5naW5lX2V2ZW50X2luc3RhbmNlKGV2ZW50KSk7Ci0KLQkJaWYgKFdBUk5f T05fT05DRSghZW5naW5lKSkgewotCQkJLyogRG8gbm90aGluZyAqLwotCQl9IGVsc2UgaWYgKHNh bXBsZSA9PSBJOTE1X1NBTVBMRV9CVVNZICYmCi0JCQkgICBlbmdpbmUtPnBtdS5idXN5X3N0YXRz KSB7Ci0JCQl2YWwgPSBrdGltZV90b19ucyhpbnRlbF9lbmdpbmVfZ2V0X2J1c3lfdGltZShlbmdp bmUpKTsKLQkJfSBlbHNlIHsKLQkJCXZhbCA9IGVuZ2luZS0+cG11LnNhbXBsZVtzYW1wbGVdOwot CQl9Ci0JfSBlbHNlIHN3aXRjaCAoZXZlbnQtPmF0dHIuY29uZmlnKSB7Ci0JY2FzZSBJOTE1X1BN VV9BQ1RVQUxfRlJFUVVFTkNZOgotCQl2YWwgPSBpOTE1LT5wbXUuc2FtcGxlW19fSTkxNV9TQU1Q TEVfRlJFUV9BQ1RdOwotCQlicmVhazsKLQljYXNlIEk5MTVfUE1VX1JFUVVFU1RFRF9GUkVRVUVO Q1k6Ci0JCXZhbCA9IGk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9GUkVRX1JFUV07Ci0J CWJyZWFrOwotCWNhc2UgSTkxNV9QTVVfRU5FUkdZOgotCQl2YWwgPSBpbnRlbF9lbmVyZ3lfdUoo aTkxNSk7Ci0JCWJyZWFrOwotCWNhc2UgSTkxNV9QTVVfSU5URVJSVVBUUzoKLQkJdmFsID0gY291 bnRfaW50ZXJydXB0cyhpOTE1KTsKLQkJYnJlYWs7Ci0KLQljYXNlIEk5MTVfUE1VX1JDNl9SRVNJ REVOQ1k6Ci0JCWlmICghaTkxNS0+Z3QuYXdha2UpCi0JCQlyZXR1cm47Ci0KLQkJdmFsID0gaW50 ZWxfcmM2X3Jlc2lkZW5jeV9ucyhpOTE1LAotCQkJCQkgICAgIElTX1ZBTExFWVZJRVcoaTkxNSkg PwotCQkJCQkgICAgIFZMVl9HVF9SRU5ERVJfUkM2IDoKLQkJCQkJICAgICBHRU42X0dUX0dGWF9S QzYpOwotCQlicmVhazsKLQotCWNhc2UgSTkxNV9QTVVfUkM2cF9SRVNJREVOQ1k6Ci0JCWlmICgh aTkxNS0+Z3QuYXdha2UpCi0JCQlyZXR1cm47Ci0KLQkJaWYgKCFJU19WQUxMRVlWSUVXKGk5MTUp KQotCQkJdmFsID0gaW50ZWxfcmM2X3Jlc2lkZW5jeV9ucyhpOTE1LCBHRU42X0dUX0dGWF9SQzZw KTsKLQkJYnJlYWs7Ci0KLQljYXNlIEk5MTVfUE1VX1JDNnBwX1JFU0lERU5DWToKLQkJaWYgKCFp OTE1LT5ndC5hd2FrZSkKLQkJCXJldHVybjsKLQotCQlpZiAoIUlTX1ZBTExFWVZJRVcoaTkxNSkp Ci0JCQl2YWwgPSBpbnRlbF9yYzZfcmVzaWRlbmN5X25zKGk5MTUsIEdFTjZfR1RfR0ZYX1JDNnBw KTsKLQkJYnJlYWs7Ci0JfQotCi0JbG9jYWw2NF9zZXQoJmV2ZW50LT5jb3VudCwgdmFsKTsKKwlp OTE1X3BtdV9kaXNhYmxlKGV2ZW50KTsKIH0KIAogc3RhdGljIGludCBpOTE1X3BtdV9ldmVudF9l dmVudF9pZHgoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQotLSAKMS44LjMuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==