From: Andres Rodriguez Subject: [PATCH 17/17] drm/amdgpu: new queue policy, take first 2 queues of each pipe v2 Date: Fri, 21 Apr 2017 16:02:42 -0400 Message-ID: <20170421200242.3072-18-andresx7@gmail.com> References: <20170421200242.3072-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170421200242.3072-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org SW5zdGVhZCBvZiB0YWtpbmcgdGhlIGZpcnN0IHBpcGUgYW5kIGdpdmluZyB0aGUgcmVzdCB0byBr ZmQsIHRha2UgdGhlCmZpcnN0IDIgcXVldWVzIG9mIGVhY2ggcGlwZS4KCkVmZmVjdGl2ZWx5LCBh bWRncHUgYW5kIGFtZGtmZCBvd24gdGhlIHNhbWUgbnVtYmVyIG9mIHF1ZXVlcy4gQnV0CmJlY2F1 c2UgdGhlIHF1ZXVlcyBhcmUgc3ByZWFkIG92ZXIgbXVsdGlwbGUgcGlwZXMgdGhlIGhhcmR3YXJl IHdpbGwgYmUKYWJsZSB0byBiZXR0ZXIgaGFuZGxlIGNvbmN1cnJlbnQgY29tcHV0ZSB3b3JrbG9h ZHMuCgphbWRncHUgZ29lcyBmcm9tIDEgcGlwZSB0byA0IHBpcGVzLCBpLmUuIGZyb20gMSBjb21w dXRlIHRocmVhZHMgdG8gNAphbWRrZmQgZ29lcyBmcm9tIDMgcGlwZSB0byA0IHBpcGVzLCBpLmUu IGZyb20gMyBjb21wdXRlIHRocmVhZHMgdG8gNAoKdjI6IGZpeCBwb2xpY3kgY29tbWVudAoKUmV2 aWV3ZWQtYnk6IEVkd2FyZCBPJ0NhbGxhZ2hhbiA8ZnVuZnVuY3RvckBmb2xrbG9yZTE5ODQubmV0 PgpSZXZpZXdlZC1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+CkFj a2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIHwgNCArKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjdfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3 XzAuYwppbmRleCAwNjMzOGU4Li5kNTIwOWQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92N18wLmMKQEAgLTI4MjEsNDIgKzI4MjEsNDIgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y3XzBfbWVj X2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWFkZXYtPmdmeC5tZWMuaHBkX2Vv cF9vYmogPSBOVUxMOwogCX0KIH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y3XzBfY29tcHV0ZV9xdWV1 ZV9hY3F1aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBpLCBxdWV1ZSwg cGlwZSwgbWVjOwogCiAJLyogcG9saWN5IGZvciBhbWRncHUgY29tcHV0ZSBxdWV1ZSBvd25lcnNo aXAgKi8KIAlmb3IgKGkgPSAwOyBpIDwgQU1ER1BVX01BWF9DT01QVVRFX1FVRVVFUzsgKytpKSB7 CiAJCXF1ZXVlID0gaSAlIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwogCQlwaXBl ID0gKGkgLyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKIAkJCSUgYWRldi0+Z2Z4 Lm1lYy5udW1fcGlwZV9wZXJfbWVjOwogCQltZWMgPSAoaSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1 ZXVlX3Blcl9waXBlKQogCQkJLyBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7CiAKIAkJ Lyogd2UndmUgcnVuIG91dCBvZiBIVyAqLwogCQlpZiAobWVjID49IGFkZXYtPmdmeC5tZWMubnVt X21lYykKIAkJCWJyZWFrOwogCi0JCS8qIHBvbGljeTogYW1kZ3B1IG93bnMgYWxsIHF1ZXVlcyBp biB0aGUgZmlyc3QgcGlwZSAqLwotCQlpZiAobWVjID09IDAgJiYgcGlwZSA9PSAwKQorCQkvKiBw b2xpY3k6IGFtZGdwdSBvd25zIHRoZSBmaXJzdCB0d28gcXVldWVzIG9mIHRoZSBmaXJzdCBNRUMg Ki8KKwkJaWYgKG1lYyA9PSAwICYmIHF1ZXVlIDwgMikKIAkJCXNldF9iaXQoaSwgYWRldi0+Z2Z4 Lm1lYy5xdWV1ZV9iaXRtYXApOwogCX0KIAogCS8qIHVwZGF0ZSB0aGUgbnVtYmVyIG9mIGFjdGl2 ZSBjb21wdXRlIHJpbmdzICovCiAJYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzID0KIAkJYml0 bWFwX3dlaWdodChhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCwgQU1ER1BVX01BWF9DT01QVVRF X1FVRVVFUyk7CiAKIAkvKiBJZiB5b3UgaGl0IHRoaXMgY2FzZSBhbmQgZWRpdGVkIHRoZSBwb2xp Y3ksIHlvdSBwcm9iYWJseSBqdXN0CiAJICogbmVlZCB0byBpbmNyZWFzZSBBTURHUFVfTUFYX0NP TVBVVEVfUklOR1MgKi8KIAlpZiAoV0FSTl9PTihhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3Mg PiBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1MpKQogCQlhZGV2LT5nZngubnVtX2NvbXB1dGVfcmlu Z3MgPSBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1M7CiB9CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y3XzBf bWVjX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IHI7CiAJdTMyICpo cGQ7CiAJc2l6ZV90IG1lY19ocGRfc2l6ZTsKIAogCWJpdG1hcF96ZXJvKGFkZXYtPmdmeC5tZWMu cXVldWVfYml0bWFwLCBBTURHUFVfTUFYX0NPTVBVVEVfUVVFVUVTKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IDQ4N2E4NDguLjExZTZkNDdjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKQEAgLTE0NDAsNDIgKzE0NDAsNDIgQEAgc3RhdGljIHZv aWQgZ2Z4X3Y4XzBfa2lxX2ZyZWVfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJYW1k Z3B1X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+YWRldi0+dmlydC5yZWdfdmFsX29mZnMpOwog CWFtZGdwdV9yaW5nX2ZpbmkocmluZyk7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92OF8wX2NvbXB1 dGVfcXVldWVfYWNxdWlyZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlpbnQgaSwg cXVldWUsIHBpcGUsIG1lYzsKIAogCS8qIHBvbGljeSBmb3IgYW1kZ3B1IGNvbXB1dGUgcXVldWUg b3duZXJzaGlwICovCiAJZm9yIChpID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVURV9RVUVVRVM7 ICsraSkgewogCQlxdWV1ZSA9IGkgJSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsK IAkJcGlwZSA9IChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCiAJCQklIGFk ZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYzsKIAkJbWVjID0gKGkgLyBhZGV2LT5nZngubWVj Lm51bV9xdWV1ZV9wZXJfcGlwZSkKIAkJCS8gYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVj OwogCiAJCS8qIHdlJ3ZlIHJ1biBvdXQgb2YgSFcgKi8KIAkJaWYgKG1lYyA+PSBhZGV2LT5nZngu bWVjLm51bV9tZWMpCiAJCQlicmVhazsKIAotCQkvKiBwb2xpY3k6IGFtZGdwdSBvd25zIGFsbCBx dWV1ZXMgaW4gdGhlIGZpcnN0IHBpcGUgKi8KLQkJaWYgKG1lYyA9PSAwICYmIHBpcGUgPT0gMCkK KwkJLyogcG9saWN5OiBhbWRncHUgb3ducyB0aGUgZmlyc3QgdHdvIHF1ZXVlcyBvZiB0aGUgZmly c3QgTUVDICovCisJCWlmIChtZWMgPT0gMCAmJiBxdWV1ZSA8IDIpCiAJCQlzZXRfYml0KGksIGFk ZXYtPmdmeC5tZWMucXVldWVfYml0bWFwKTsKIAl9CiAKIAkvKiB1cGRhdGUgdGhlIG51bWJlciBv ZiBhY3RpdmUgY29tcHV0ZSByaW5ncyAqLwogCWFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5ncyA9 CiAJCWJpdG1hcF93ZWlnaHQoYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXAsIEFNREdQVV9NQVhf Q09NUFVURV9RVUVVRVMpOwogCiAJLyogSWYgeW91IGhpdCB0aGlzIGNhc2UgYW5kIGVkaXRlZCB0 aGUgcG9saWN5LCB5b3UgcHJvYmFibHkganVzdAogCSAqIG5lZWQgdG8gaW5jcmVhc2UgQU1ER1BV X01BWF9DT01QVVRFX1JJTkdTICovCiAJaWYgKFdBUk5fT04oYWRldi0+Z2Z4Lm51bV9jb21wdXRl X3JpbmdzID4gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKSkKIAkJYWRldi0+Z2Z4Lm51bV9jb21w dXRlX3JpbmdzID0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTOwogfQogCiBzdGF0aWMgaW50IGdm eF92OF8wX21lY19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCByOwog CXUzMiAqaHBkOwogCXNpemVfdCBtZWNfaHBkX3NpemU7CiAKIAliaXRtYXBfemVybyhhZGV2LT5n ZngubWVjLnF1ZXVlX2JpdG1hcCwgQU1ER1BVX01BWF9DT01QVVRFX1FVRVVFUyk7Ci0tIAoyLjku MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==