From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= Subject: [PATCH] drm/amdgpu/gfx9: simplify and fix GRBM index selection Date: Fri, 14 Jul 2017 13:41:54 +0200 Message-ID: <20170714114154.28035-1-nhaehnle@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= RnJvbTogTmljb2xhaSBIw6RobmxlIDxuaWNvbGFpLmhhZWhubGVAYW1kLmNvbT4KCkNvcHkgdGhl IGFwcHJvYWNoIHRha2VuIGJ5IGdmeDgsIHdoaWNoIHNpbXBsaWZpZXMgdGhlIGNvZGUsIGFuZCBz ZXQgdGhlCmluc3RhbmNlIGluZGV4IHByb3Blcmx5LiBUaGUgbGF0dGVyIGlzIHJlcXVpcmVkIGZv ciBkZWJ1Z2dpbmcsIGUuZy4gZm9yCnJlYWRpbmcgd2F2ZSBzdGF0dXMgYnkgVU1SLgoKU2lnbmVk LW9mZi1ieTogTmljb2xhaSBIw6RobmxlIDxuaWNvbGFpLmhhZWhubGVAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIHwgMjQgKysrKysrKysrKysrKy0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggNjk4NjI4NS4uMDIw ZGE5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCkBAIC0xNDY4LDM1ICsx NDY4LDM3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfc3dfZmluaSh2b2lkICpoYW5kbGUpCiB9CiAK IAogc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfdGlsaW5nX21vZGVfdGFibGVfaW5pdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldikKIHsKIAkvKiBUT0RPICovCiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92 OV8wX3NlbGVjdF9zZV9zaChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHNlX251bSwg dTMyIHNoX251bSwgdTMyIGluc3RhbmNlKQogewotCXUzMiBkYXRhID0gUkVHX1NFVF9GSUVMRCgw LCBHUkJNX0dGWF9JTkRFWCwgSU5TVEFOQ0VfQlJPQURDQVNUX1dSSVRFUywgMSk7CisJdTMyIGRh dGE7CiAKLQlpZiAoKHNlX251bSA9PSAweGZmZmZmZmZmKSAmJiAoc2hfbnVtID09IDB4ZmZmZmZm ZmYpKSB7Ci0JCWRhdGEgPSBSRUdfU0VUX0ZJRUxEKGRhdGEsIEdSQk1fR0ZYX0lOREVYLCBTSF9C Uk9BRENBU1RfV1JJVEVTLCAxKTsKLQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9H RlhfSU5ERVgsIFNFX0JST0FEQ0FTVF9XUklURVMsIDEpOwotCX0gZWxzZSBpZiAoc2VfbnVtID09 IDB4ZmZmZmZmZmYpIHsKLQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5E RVgsIFNIX0lOREVYLCBzaF9udW0pOworCWlmIChpbnN0YW5jZSA9PSAweGZmZmZmZmZmKQorCQlk YXRhID0gUkVHX1NFVF9GSUVMRCgwLCBHUkJNX0dGWF9JTkRFWCwgSU5TVEFOQ0VfQlJPQURDQVNU X1dSSVRFUywgMSk7CisJZWxzZQorCQlkYXRhID0gUkVHX1NFVF9GSUVMRCgwLCBHUkJNX0dGWF9J TkRFWCwgSU5TVEFOQ0VfSU5ERVgsIGluc3RhbmNlKTsKKworCWlmIChzZV9udW0gPT0gMHhmZmZm ZmZmZikKIAkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNFX0JS T0FEQ0FTVF9XUklURVMsIDEpOwotCX0gZWxzZSBpZiAoc2hfbnVtID09IDB4ZmZmZmZmZmYpIHsK LQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNIX0JST0FEQ0FT VF9XUklURVMsIDEpOworCWVsc2UKIAkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9H RlhfSU5ERVgsIFNFX0lOREVYLCBzZV9udW0pOwotCX0gZWxzZSB7CisKKwlpZiAoc2hfbnVtID09 IDB4ZmZmZmZmZmYpCisJCWRhdGEgPSBSRUdfU0VUX0ZJRUxEKGRhdGEsIEdSQk1fR0ZYX0lOREVY LCBTSF9CUk9BRENBU1RfV1JJVEVTLCAxKTsKKwllbHNlCiAJCWRhdGEgPSBSRUdfU0VUX0ZJRUxE KGRhdGEsIEdSQk1fR0ZYX0lOREVYLCBTSF9JTkRFWCwgc2hfbnVtKTsKLQkJZGF0YSA9IFJFR19T RVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNFX0lOREVYLCBzZV9udW0pOwotCX0KKwog CVdSRUczMl9TT0MxNShHQywgMCwgbW1HUkJNX0dGWF9JTkRFWCwgZGF0YSk7CiB9CiAKIHN0YXRp YyB1MzIgZ2Z4X3Y5XzBfZ2V0X3JiX2FjdGl2ZV9iaXRtYXAoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiB7CiAJdTMyIGRhdGEsIG1hc2s7CiAKIAlkYXRhID0gUlJFRzMyX1NPQzE1KEdDLCAw LCBtbUNDX1JCX0JBQ0tFTkRfRElTQUJMRSk7CiAJZGF0YSB8PSBSUkVHMzJfU09DMTUoR0MsIDAs IG1tR0NfVVNFUl9SQl9CQUNLRU5EX0RJU0FCTEUpOwogCi0tIAoyLjkuMwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QK YW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==