From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lionel Landwerlin Subject: [PATCH v3 3/9] drm/i915/perf: only append status when data is available Date: Tue, 26 Feb 2019 14:29:05 +0000 Message-ID: <20190226142911.9789-4-lionel.g.landwerlin@intel.com> References: <20190226142911.9789-1-lionel.g.landwerlin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01DF689E3F for ; Tue, 26 Feb 2019 14:29:22 +0000 (UTC) In-Reply-To: <20190226142911.9789-1-lionel.g.landwerlin@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 VGhlIG9ubHkgYml0IG9mIHRoZSBzdGF0dXMgcmVnaXN0ZXIgd2UgY3VycmVudGx5IHJlcG9ydCBp biB0aGUKaTkxNS1wZXJmIHN0cmVhbSBpcyB0aGUgInJlcG9ydCBsb3NzIiBiaXQuIE9ubHkgcmVw b3J0IHRoaXMgd2hlbiB3ZQpoYXZlIHNvbWUgZGF0YSB0byByZXBvcnQgd2l0aCBpdC4gVGhlcmUg d2FzIGEga2luZCBvZiBpbmNvbnNpc3RlbmN5CmhlcmUgaW4gdGhhdCB3ZSBjb3VsZCByZXBvcnQg cmVwb3J0IGxvc3Mgd2l0aG91dCBhcHBlbmRpbmcgdGhlIHJlcG9ydHMKYXNzb2NpYXRlZCB3aXRo IHRoZSBsb3NzLgoKU2lnbmVkLW9mZi1ieTogTGlvbmVsIExhbmR3ZXJsaW4gPGxpb25lbC5nLmxh bmR3ZXJsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5j IHwgNTQgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz NCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3BlcmYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5j CmluZGV4IDU1ZDI1MjU1YmQ2Ny4uNDUwNGQ0ZTE4NjMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3BlcmYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bl cmYuYwpAQCAtNjM2LDYgKzYzNiw3IEBAIHN0YXRpYyBpbnQgYXBwZW5kX29hX3NhbXBsZShzdHJ1 Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogICogUmV0dXJuczogMCBvbiBzdWNjZXNzLCBu ZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCiAgKi8KIHN0YXRpYyBpbnQgZ2VuOF9hcHBl bmRfb2FfcmVwb3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAorCQkJCSAgdTMy IG9hc3RhdHVzLAogCQkJCSAgY2hhciBfX3VzZXIgKmJ1ZiwKIAkJCQkgIHNpemVfdCBjb3VudCwK IAkJCQkgIHNpemVfdCAqb2Zmc2V0KQpAQCAtNjgxLDYgKzY4MiwyMSBAQCBzdGF0aWMgaW50IGdl bjhfYXBwZW5kX29hX3JlcG9ydHMoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAkJ ICAgICAgaGVhZCwgdGFpbCkpCiAJCXJldHVybiAtRUlPOwogCisJLyoKKwkgKiBJZiB0aGVyZSBp cyBub3RoaW5nIHRvIHJlYWQsIGRvbid0IGFwcGVuZCB0aGUgc3RhdHVzIHJlcG9ydCB5ZXQsCisJ ICogd2FpdCB1bnRpbCB3ZSBoYXZlIHNvbWUgZGF0YSBhdmFpbGFibGUuCisJICovCisJaWYgKCFP QV9UQUtFTih0YWlsLCBoZWFkKSkKKwkJcmV0dXJuIDA7CisKKwlpZiAob2FzdGF0dXMgJiBHRU44 X09BU1RBVFVTX1JFUE9SVF9MT1NUKSB7CisJCXJldCA9IGFwcGVuZF9vYV9zdGF0dXMoc3RyZWFt LCBidWYsIGNvdW50LCBvZmZzZXQsCisJCQkJICAgICAgIERSTV9JOTE1X1BFUkZfUkVDT1JEX09B X1JFUE9SVF9MT1NUKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJCUk5MTVfV1JJVEUo R0VOOF9PQVNUQVRVUywKKwkJCSAgIG9hc3RhdHVzICYgfkdFTjhfT0FTVEFUVVNfUkVQT1JUX0xP U1QpOworCX0KIAogCWZvciAoLyogbm9uZSAqLzsKIAkgICAgICh0YWtlbiA9IE9BX1RBS0VOKHRh aWwsIGhlYWQpKTsKQEAgLTg4MCwxNiArODk2LDcgQEAgc3RhdGljIGludCBnZW44X29hX3JlYWQo c3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAkJb2FzdGF0dXMgPSBJOTE1X1JFQUQo R0VOOF9PQVNUQVRVUyk7CiAJfQogCi0JaWYgKG9hc3RhdHVzICYgR0VOOF9PQVNUQVRVU19SRVBP UlRfTE9TVCkgewotCQlyZXQgPSBhcHBlbmRfb2Ffc3RhdHVzKHN0cmVhbSwgYnVmLCBjb3VudCwg b2Zmc2V0LAotCQkJCSAgICAgICBEUk1fSTkxNV9QRVJGX1JFQ09SRF9PQV9SRVBPUlRfTE9TVCk7 Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCQlJOTE1X1dSSVRFKEdFTjhfT0FTVEFUVVMs Ci0JCQkgICBvYXN0YXR1cyAmIH5HRU44X09BU1RBVFVTX1JFUE9SVF9MT1NUKTsKLQl9Ci0KLQly ZXR1cm4gZ2VuOF9hcHBlbmRfb2FfcmVwb3J0cyhzdHJlYW0sIGJ1ZiwgY291bnQsIG9mZnNldCk7 CisJcmV0dXJuIGdlbjhfYXBwZW5kX29hX3JlcG9ydHMoc3RyZWFtLCBvYXN0YXR1cywgYnVmLCBj b3VudCwgb2Zmc2V0KTsKIH0KIAogLyoqCkBAIC05MTMsNiArOTIwLDcgQEAgc3RhdGljIGludCBn ZW44X29hX3JlYWQoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKICAqIFJldHVybnM6 IDAgb24gc3VjY2VzcywgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWlsdXJlLgogICovCiBzdGF0 aWMgaW50IGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0 cmVhbSwKKwkJCQkgIHUzMiBvYXN0YXR1czEsCiAJCQkJICBjaGFyIF9fdXNlciAqYnVmLAogCQkJ CSAgc2l6ZV90IGNvdW50LAogCQkJCSAgc2l6ZV90ICpvZmZzZXQpCkBAIC05NTYsNiArOTY0LDIx IEBAIHN0YXRpYyBpbnQgZ2VuN19hcHBlbmRfb2FfcmVwb3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0 cmVhbSAqc3RyZWFtLAogCQkgICAgICBoZWFkLCB0YWlsKSkKIAkJcmV0dXJuIC1FSU87CiAKKwkv KgorCSAqIElmIHRoZXJlIGlzIG5vdGhpbmcgdG8gcmVhZCwgZG9uJ3QgYXBwZW5kIHRoZSBzdGF0 dXMgcmVwb3J0IHlldCwKKwkgKiB3YWl0IHVudGlsIHdlIGhhdmUgc29tZSBkYXRhIGF2YWlsYWJs ZS4KKwkgKi8KKwlpZiAoIU9BX1RBS0VOKHRhaWwsIGhlYWQpKQorCQlyZXR1cm4gMDsKKworCWlm ICh1bmxpa2VseShvYXN0YXR1czEgJiBHRU43X09BU1RBVFVTMV9SRVBPUlRfTE9TVCkpIHsKKwkJ cmV0ID0gYXBwZW5kX29hX3N0YXR1cyhzdHJlYW0sIGJ1ZiwgY291bnQsIG9mZnNldCwKKwkJCQkg ICAgICAgRFJNX0k5MTVfUEVSRl9SRUNPUkRfT0FfUkVQT1JUX0xPU1QpOworCQlpZiAocmV0KQor CQkJcmV0dXJuIHJldDsKKwkJZGV2X3ByaXYtPnBlcmYub2EuZ2VuN19sYXRjaGVkX29hc3RhdHVz MSB8PQorCQkJR0VON19PQVNUQVRVUzFfUkVQT1JUX0xPU1Q7CisJfQogCiAJZm9yICgvKiBub25l ICovOwogCSAgICAgKHRha2VuID0gT0FfVEFLRU4odGFpbCwgaGVhZCkpOwpAQCAtMTA4OSwxNiAr MTExMiw3IEBAIHN0YXRpYyBpbnQgZ2VuN19vYV9yZWFkKHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFt ICpzdHJlYW0sCiAJCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7CiAJfQog Ci0JaWYgKHVubGlrZWx5KG9hc3RhdHVzMSAmIEdFTjdfT0FTVEFUVVMxX1JFUE9SVF9MT1NUKSkg ewotCQlyZXQgPSBhcHBlbmRfb2Ffc3RhdHVzKHN0cmVhbSwgYnVmLCBjb3VudCwgb2Zmc2V0LAot CQkJCSAgICAgICBEUk1fSTkxNV9QRVJGX1JFQ09SRF9PQV9SRVBPUlRfTE9TVCk7Ci0JCWlmIChy ZXQpCi0JCQlyZXR1cm4gcmV0OwotCQlkZXZfcHJpdi0+cGVyZi5vYS5nZW43X2xhdGNoZWRfb2Fz dGF0dXMxIHw9Ci0JCQlHRU43X09BU1RBVFVTMV9SRVBPUlRfTE9TVDsKLQl9Ci0KLQlyZXR1cm4g Z2VuN19hcHBlbmRfb2FfcmVwb3J0cyhzdHJlYW0sIGJ1ZiwgY291bnQsIG9mZnNldCk7CisJcmV0 dXJuIGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RyZWFtLCBvYXN0YXR1czEsIGJ1ZiwgY291bnQs IG9mZnNldCk7CiB9CiAKIC8qKgotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZng=