From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 11/37] drm/i915/guc: Add a second client, to be used for preemption Date: Mon, 23 Nov 2015 11:41:46 +0000 Message-ID: <1448278932-31551-12-git-send-email-John.C.Harrison@Intel.com> References: <1448278932-31551-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id AF4DD6E544 for ; Mon, 23 Nov 2015 03:42:28 -0800 (PST) In-Reply-To: <1448278932-31551-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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KClRoaXMgc2Vjb25k IGNsaWVudCBpcyBjcmVhdGVkIHdpdGggcHJpb3JpdHkgS01EX0hJR0gsIGFuZCBtYXJrZWQKYXMg cHJlZW1wdGl2ZS4KCkZvcjogVklaLTIwMjEKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRh dmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyAgICAgICAgfCAgOSArKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyB8IDE1ICsrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNl cnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpp bmRleCBmZWZlNzNjLi45ZThmNjI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpA QCAtMjY5MCw2ICsyNjkwLDcgQEAgc3RhdGljIGludCBpOTE1X2d1Y19pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9ndWMgZ3VjOwogCXN0cnVjdCBpOTE1 X2d1Y19jbGllbnQgY2xpZW50ID0ge307CisJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCBwcmVlbXB0 ID0ge307CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAllbnVtIGludGVsX3Jpbmdf aWQgaTsKIAl1NjQgdG90YWwgPSAwOwpAQCAtMjcwNSw2ICsyNzA2LDExIEBAIHN0YXRpYyBpbnQg aTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCWNsaWVudCA9 ICpndWMuZXhlY2J1Zl9jbGllbnQ7CiAJCXNwaW5fdW5sb2NrKCZndWMuZXhlY2J1Zl9jbGllbnQt PndxX2xvY2spOwogCX0KKwlpZiAoZ3VjLnByZWVtcHRfY2xpZW50KSB7CisJCXNwaW5fbG9jaygm Z3VjLnByZWVtcHRfY2xpZW50LT53cV9sb2NrKTsKKwkJcHJlZW1wdCA9ICpndWMucHJlZW1wdF9j bGllbnQ7CisJCXNwaW5fdW5sb2NrKCZndWMucHJlZW1wdF9jbGllbnQtPndxX2xvY2spOworCX0K IAlzcGluX3VubG9jaygmZGV2X3ByaXYtPmd1Yy5ob3N0Mmd1Y19sb2NrKTsKIAogCXNlcV9wcmlu dGYobSwgIkd1QyB0b3RhbCBhY3Rpb24gY291bnQ6ICVsbHVcbiIsIGd1Yy5hY3Rpb25fY291bnQp OwpAQCAtMjcyNSw2ICsyNzMxLDkgQEAgc3RhdGljIGludCBpOTE1X2d1Y19pbmZvKHN0cnVjdCBz ZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzZXFfcHJpbnRmKG0sICJcbkd1QyBleGVjYnVmIGNs aWVudCBAICVwOlxuIiwgZ3VjLmV4ZWNidWZfY2xpZW50KTsKIAlpOTE1X2d1Y19jbGllbnRfaW5m byhtLCBkZXZfcHJpdiwgJmNsaWVudCk7CiAKKwlzZXFfcHJpbnRmKG0sICJcbkd1QyBwcmVlbXB0 IGNsaWVudCBAICVwOlxuIiwgZ3VjLnByZWVtcHRfY2xpZW50KTsKKwlpOTE1X2d1Y19jbGllbnRf aW5mbyhtLCBkZXZfcHJpdiwgJnByZWVtcHQpOworCiAJLyogQWRkIG1vcmUgYXMgcmVxdWlyZWQg Li4uICovCiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYwppbmRleCA1NWUxMGViLi5kOGZkNjQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0zOTUsNiArMzk1LDggQEAgc3RhdGljIHZvaWQgZ3Vj X2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCW1lbXNldCgmZGVzYywgMCwg c2l6ZW9mKGRlc2MpKTsKIAogCWRlc2MuYXR0cmlidXRlID0gR1VDX0NUWF9ERVNDX0FUVFJfQUNU SVZFIHwgR1VDX0NUWF9ERVNDX0FUVFJfS0VSTkVMOworCWlmIChjbGllbnQtPnByaW9yaXR5IDw9 IEdVQ19DVFhfUFJJT1JJVFlfSElHSCkKKwkJZGVzYy5hdHRyaWJ1dGUgfD0gR1VDX0NUWF9ERVND X0FUVFJfUFJFRU1QVDsKIAlkZXNjLmNvbnRleHRfaWQgPSBjbGllbnQtPmN0eF9pbmRleDsKIAlk ZXNjLnByaW9yaXR5ID0gY2xpZW50LT5wcmlvcml0eTsKIAlkZXNjLmRiX2lkID0gY2xpZW50LT5k b29yYmVsbF9pZDsKQEAgLTU4OCw2ICs1OTAsOSBAQCBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVj dCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCWludCBx X3JldCwgYl9yZXQ7CiAKKwlpZiAoV0FSTl9PTihyaW5nX2lkID49IEk5MTVfTlVNX1JJTkdTKSkK KwkJcmV0dXJuIC1FTlhJTzsKKwogCS8qIE5lZWQgdGhpcyBiZWNhdXNlIG9mIHRoZSBkZWZlcnJl ZCBwaW4gY3R4IGFuZCByaW5nICovCiAJLyogU2hhbGwgd2UgbW92ZSB0aGlzIHJpZ2h0IGFmdGVy IHJpbmcgaXMgcGlubmVkPyAqLwogCWxyX2NvbnRleHRfdXBkYXRlKHJxKTsKQEAgLTg4Miw5ICs4 ODcsMTUgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBleGVjYnVmIGd1Y19jbGllbnRc biIpOwogCQlyZXR1cm4gLUVOT01FTTsKIAl9Ci0KIAlndWMtPmV4ZWNidWZfY2xpZW50ID0gY2xp ZW50OwogCisJLyogMm5kIGNsaWVudCBmb3IgcHJlZW1wdGl2ZSBzdWJtaXNzaW9uICovCisJY2xp ZW50ID0gZ3VjX2NsaWVudF9hbGxvYyhkZXYsIEdVQ19DVFhfUFJJT1JJVFlfS01EX0hJR0gsIGN0 eCk7CisJaWYgKCFjbGllbnQpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIHByZWVt cHRpdmUgZ3VjX2NsaWVudFxuIik7CisJfQorCWd1Yy0+cHJlZW1wdF9jbGllbnQgPSBjbGllbnQ7 CisKIAlob3N0Mmd1Y19zYW1wbGVfZm9yY2V3YWtlKGd1YywgY2xpZW50KTsKIAogCXJldHVybiAw OwpAQCAtODk1LDYgKzkwNiw4IEBAIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYt Pmd1YzsKIAorCWd1Y19jbGllbnRfZnJlZShkZXYsIGd1Yy0+cHJlZW1wdF9jbGllbnQpOworCWd1 Yy0+cHJlZW1wdF9jbGllbnQgPSBOVUxMOwogCWd1Y19jbGllbnRfZnJlZShkZXYsIGd1Yy0+ZXhl Y2J1Zl9jbGllbnQpOwogCWd1Yy0+ZXhlY2J1Zl9jbGllbnQgPSBOVUxMOwogfQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaAppbmRleCAzODZlNzlhLi5mNTZlMGQ5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuaApAQCAtOTQsNiArOTQsNyBAQCBzdHJ1Y3QgaW50ZWxfZ3VjIHsKIAlzdHJ1Y3QgaWRh IGN0eF9pZHM7CiAKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpleGVjYnVmX2NsaWVudDsKKwlz dHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpwcmVlbXB0X2NsaWVudDsKIAogCXNwaW5sb2NrX3QgaG9z dDJndWNfbG9jazsJLyogUHJvdGVjdHMgYWxsIGRhdGEgYmVsb3cJKi8KIAotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==