From: Mika Kuoppala Subject: [PATCH 3/3] drm/i915: Improve GuC request coalescing Date: Fri, 29 Sep 2017 15:42:49 +0300 Message-ID: <20170929124249.10202-3-mika.kuoppala@intel.com> References: <20170929124249.10202-1-mika.kuoppala@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 ESMTPS id A7C216EB41 for ; Fri, 29 Sep 2017 12:44:23 +0000 (UTC) In-Reply-To: <20170929124249.10202-1-mika.kuoppala@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 Tm93IHRoYXQgd2UgY2FuIGtlZXAgdHJhY2sgb2Ygd2hhdCBwb3J0cyB3ZSBoYXZlCmRlcXVldWVk LCBzdWJtaXQgb25seSB0aG9zZSBwb3J0cyBpbnN0ZWFkIG9mIGl0ZXJhdGluZwp0aHJvdWdoIGFs bCBwb3J0cy4KCnYyOiBzL2NvYWxlc2NlL3N1Ym1pdCAoTWljaGHFgikKdjM6IHJlYmFzZSB0byBu ZXcgbmFtaW5nCgpDYzogTWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwu Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1v ZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogTWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDMxICsrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oICAgIHwgIDkgKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyks IDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwppbmRleCBkNjA3MTM5NmRhMzIuLjA5MzIxMWU3NGFkNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNDg1LDExICs0ODUsMTMgQEAgc3RhdGlj IHZvaWQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQog LyoqCiAgKiBpOTE1X2d1Y19zdWJtaXQoKSAtIFN1Ym1pdCBjb21tYW5kcyB0aHJvdWdoIEd1Qwog ICogQGVuZ2luZTogZW5naW5lIGFzc29jaWF0ZWQgd2l0aCB0aGUgY29tbWFuZHMKKyAqIEBmaXJz dDogaW5kZXggb2YgZmlyc3QgZXhlY2xpc3QgcG9ydCB0byBzdGFydCBjb2FsZXNjaW5nIGZyb20K ICAqCiAgKiBUaGUgb25seSBlcnJvciBoZXJlIGFyaXNlcyBpZiB0aGUgZG9vcmJlbGwgaGFyZHdh cmUgaXNuJ3QgZnVuY3Rpb25pbmcKICAqIGFzIGV4cGVjdGVkLCB3aGljaCByZWFsbHkgc2hvdWxk bid0IGhhcHBlbi4KICAqLwotc3RhdGljIHZvaWQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyB2b2lkIGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgY29uc3QgdW5zaWduZWQgaW50IGZpcnN0 KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsK IAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKQEAgLTQ5OCw3ICs1MDAs NyBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCWNvbnN0IHVuc2lnbmVkIGludCBlbmdpbmVfaWQgPSBlbmdpbmUtPmlkOwogCXVu c2lnbmVkIGludCBuOwogCi0JZm9yIChuID0gMDsgbiA8IGV4ZWNsaXN0c19hY3RpdmVfcG9ydHMo ZXhlY2xpc3RzKTsgbisrKSB7CisJZm9yIChuID0gZmlyc3Q7IG4gPCBleGVjbGlzdHNfYWN0aXZl X3BvcnRzKGV4ZWNsaXN0cyk7IG4rKykgewogCQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydDsK IAkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycTsKIAkJdW5zaWduZWQgaW50IGNvdW50 OwpAQCAtNTA2LDIxICs1MDgsMjIgQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfc3VibWl0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJcG9ydCA9IGV4ZWNsaXN0c19wb3J0KGV4ZWNs aXN0cywgbik7CiAJCXJxID0gcG9ydF91bnBhY2socG9ydCwgJmNvdW50KTsKIAotCQlpZiAocnEg JiYgY291bnQgPT0gMCkgewotCQkJcG9ydF9zZXQocG9ydCwgcG9ydF9wYWNrKHJxLCArK2NvdW50 KSk7CisJCUdFTV9CVUdfT04oIXJxKTsKKwkJR0VNX0JVR19PTihjb3VudCk7CiAKLQkJCWlmIChp OTE1X3ZtYV9pc19tYXBfYW5kX2ZlbmNlYWJsZShycS0+cmluZy0+dm1hKSkKLQkJCQlQT1NUSU5H X1JFQURfRlcoR1VDX1NUQVRVUyk7CisJCXBvcnRfc2V0KHBvcnQsIHBvcnRfcGFjayhycSwgKytj b3VudCkpOwogCi0JCQlzcGluX2xvY2soJmNsaWVudC0+d3FfbG9jayk7CisJCWlmIChpOTE1X3Zt YV9pc19tYXBfYW5kX2ZlbmNlYWJsZShycS0+cmluZy0+dm1hKSkKKwkJCVBPU1RJTkdfUkVBRF9G VyhHVUNfU1RBVFVTKTsKIAotCQkJZ3VjX3dxX2l0ZW1fYXBwZW5kKGNsaWVudCwgcnEpOwotCQkJ Z3VjX3JpbmdfZG9vcmJlbGwoY2xpZW50KTsKKwkJc3Bpbl9sb2NrKCZjbGllbnQtPndxX2xvY2sp OwogCi0JCQljbGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZV9pZF0gKz0gMTsKKwkJZ3VjX3dxX2l0 ZW1fYXBwZW5kKGNsaWVudCwgcnEpOworCQlndWNfcmluZ19kb29yYmVsbChjbGllbnQpOwogCi0J CQlzcGluX3VubG9jaygmY2xpZW50LT53cV9sb2NrKTsKLQkJfQorCQljbGllbnQtPnN1Ym1pc3Np b25zW2VuZ2luZV9pZF0gKz0gMTsKKworCQlzcGluX3VubG9jaygmY2xpZW50LT53cV9sb2NrKTsK IAl9CiB9CiAKQEAgLTU2Nyw2ICs1NzAsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19kZXF1ZXVl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKmxhc3QgPSBOVUxMOwogCWJvb2wgc3VibWl0ID0gZmFsc2U7CiAJc3RydWN0IHJiX25v ZGUgKnJiOworCXVuc2lnbmVkIGludCBmaXJzdF9pZHg7CiAKIAlzcGluX2xvY2tfaXJxKCZlbmdp bmUtPnRpbWVsaW5lLT5sb2NrKTsKIAlyYiA9IGV4ZWNsaXN0cy0+Zmlyc3Q7CkBAIC01NzYsNiAr NTgwLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiAJCWdvdG8gZG9uZTsKIAogCXBvcnQgPSBleGVjbGlzdHNfcmVxdWVzdF9w b3J0KGV4ZWNsaXN0cyk7CisJZmlyc3RfaWR4ID0gZXhlY2xpc3RzX3BvcnRfaW5kZXgoZXhlY2xp c3RzLCBwb3J0KTsKIAogCWRvIHsKIAkJc3RydWN0IGk5MTVfcHJpb2xpc3QgKnAgPSByYl9lbnRy eShyYiwgdHlwZW9mKCpwKSwgbm9kZSk7CkBAIC02MTUsNyArNjIwLDcgQEAgc3RhdGljIHZvaWQg aTkxNV9ndWNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZXhlY2xp c3RzLT5maXJzdCA9IHJiOwogCWlmIChzdWJtaXQpIHsKIAkJcG9ydF9hc3NpZ24ocG9ydCwgbGFz dCk7Ci0JCWk5MTVfZ3VjX3N1Ym1pdChlbmdpbmUpOworCQlpOTE1X2d1Y19zdWJtaXQoZW5naW5l LCBmaXJzdF9pZHgpOwogCX0KIAlzcGluX3VubG9ja19pcnEoJmVuZ2luZS0+dGltZWxpbmUtPmxv Y2spOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGMwOWQx YzkzZmQxNS4uNWFkZjZkMDIzZjNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCkBAIC01NTcsNiArNTU3LDE1IEBAIGV4ZWNsaXN0c19wb3J0KHN0cnVjdCBpbnRlbF9l bmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzLAogCXJldHVybiAmZXhlY2xpc3RzLT5w b3J0W3BvcnRfbihleGVjbGlzdHMsIG4pXTsKIH0KIAorc3RhdGljIGlubGluZSB1bnNpZ25lZCBp bnQKK2V4ZWNsaXN0c19wb3J0X2luZGV4KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xp c3RzICogY29uc3QgZXhlY2xpc3RzLAorCQkgICAgIGNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0 ICogY29uc3QgcG9ydCkKK3sKKwljb25zdCB1bnNpZ25lZCBpbnQgbiA9IHBvcnRfaW5kZXgocG9y dCwgZXhlY2xpc3RzKTsKKworCXJldHVybiBfX3BvcnRfbihuLCAtZXhlY2xpc3RzLT5wb3J0X2hl YWQsIGV4ZWNsaXN0cy0+cG9ydF9tYXNrKTsKK30KKwogc3RhdGljIGlubGluZSBzdHJ1Y3QgZXhl Y2xpc3RfcG9ydCAqCiBleGVjbGlzdHNfcG9ydF9oZWFkKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhl Y2xpc3RzICogY29uc3QgZXhlY2xpc3RzKQogewotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK