From: Tom St Denis Subject: [PATCH 2/3] drm/amd/amdgpu: Simplify various gfx v8 functions Date: Tue, 9 Aug 2016 10:27:38 -0400 Message-ID: <20160809142739.1401-3-tom.stdenis@amd.com> References: <20160809142739.1401-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160809142739.1401-1-tom.stdenis-5C7GfCeVMHo@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: Tom St Denis U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgfCA2MSArKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDQx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IDhh YTZiNTRmNDUxNi4uNWY5MWE4MzRhZWQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMKQEAgLTM0NTksMTkgKzM0NTksMTYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfc2VsZWN0 X3NlX3NoKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCWVsc2UKIAkJZGF0YSA9IFJFR19T RVRfRklFTEQoMCwgR1JCTV9HRlhfSU5ERVgsIElOU1RBTkNFX0lOREVYLCBpbnN0YW5jZSk7CiAK LQlpZiAoKHNlX251bSA9PSAweGZmZmZmZmZmKSAmJiAoc2hfbnVtID09IDB4ZmZmZmZmZmYpKSB7 Ci0JCWRhdGEgPSBSRUdfU0VUX0ZJRUxEKGRhdGEsIEdSQk1fR0ZYX0lOREVYLCBTSF9CUk9BRENB U1RfV1JJVEVTLCAxKTsKLQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5E RVgsIFNFX0JST0FEQ0FTVF9XUklURVMsIDEpOwotCX0gZWxzZSBpZiAoc2VfbnVtID09IDB4ZmZm ZmZmZmYpIHsKLQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNI X0lOREVYLCBzaF9udW0pOworCWlmIChzZV9udW0gPT0gMHhmZmZmZmZmZikKIAkJZGF0YSA9IFJF R19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNFX0JST0FEQ0FTVF9XUklURVMsIDEp OwotCX0gZWxzZSBpZiAoc2hfbnVtID09IDB4ZmZmZmZmZmYpIHsKLQkJZGF0YSA9IFJFR19TRVRf RklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNIX0JST0FEQ0FTVF9XUklURVMsIDEpOworCWVs c2UKIAkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JCTV9HRlhfSU5ERVgsIFNFX0lOREVY LCBzZV9udW0pOwotCX0gZWxzZSB7CisKKwlpZiAoc2hfbnVtID09IDB4ZmZmZmZmZmYpCisJCWRh dGEgPSBSRUdfU0VUX0ZJRUxEKGRhdGEsIEdSQk1fR0ZYX0lOREVYLCBTSF9CUk9BRENBU1RfV1JJ VEVTLCAxKTsKKwllbHNlCiAJCWRhdGEgPSBSRUdfU0VUX0ZJRUxEKGRhdGEsIEdSQk1fR0ZYX0lO REVYLCBTSF9JTkRFWCwgc2hfbnVtKTsKLQkJZGF0YSA9IFJFR19TRVRfRklFTEQoZGF0YSwgR1JC TV9HRlhfSU5ERVgsIFNFX0lOREVYLCBzZV9udW0pOwotCX0KKwogCVdSRUczMihtbUdSQk1fR0ZY X0lOREVYLCBkYXRhKTsKIH0KIApAQCAtMzQ4NCwxMSArMzQ4MSwxMCBAQCBzdGF0aWMgdTMyIGdm eF92OF8wX2dldF9yYl9hY3RpdmVfYml0bWFwKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQog ewogCXUzMiBkYXRhLCBtYXNrOwogCi0JZGF0YSA9IFJSRUczMihtbUNDX1JCX0JBQ0tFTkRfRElT QUJMRSk7Ci0JZGF0YSB8PSBSUkVHMzIobW1HQ19VU0VSX1JCX0JBQ0tFTkRfRElTQUJMRSk7CisJ ZGF0YSA9ICBSUkVHMzIobW1DQ19SQl9CQUNLRU5EX0RJU0FCTEUpIHwKKwkJUlJFRzMyKG1tR0Nf VVNFUl9SQl9CQUNLRU5EX0RJU0FCTEUpOwogCi0JZGF0YSAmPSBDQ19SQl9CQUNLRU5EX0RJU0FC TEVfX0JBQ0tFTkRfRElTQUJMRV9NQVNLOwotCWRhdGEgPj49IEdDX1VTRVJfUkJfQkFDS0VORF9E SVNBQkxFX19CQUNLRU5EX0RJU0FCTEVfX1NISUZUOworCWRhdGEgPSBSRUdfR0VUX0ZJRUxEKGRh dGEsIEdDX1VTRVJfUkJfQkFDS0VORF9ESVNBQkxFLCBCQUNLRU5EX0RJU0FCTEUpOwogCiAJbWFz ayA9IGdmeF92OF8wX2NyZWF0ZV9iaXRtYXNrKGFkZXYtPmdmeC5jb25maWcubWF4X2JhY2tlbmRz X3Blcl9zZSAvCiAJCQkJICAgICAgIGFkZXYtPmdmeC5jb25maWcubWF4X3NoX3Blcl9zZSk7CkBA IC00MjkyLDEyICs0Mjg4LDEwIEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfY3BfZ2Z4X3Jlc3VtZShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlnZnhfdjhfMF9jcF9nZnhfc3RhcnQoYWRldik7 CiAJcmluZy0+cmVhZHkgPSB0cnVlOwogCXIgPSBhbWRncHVfcmluZ190ZXN0X3JpbmcocmluZyk7 Ci0JaWYgKHIpIHsKKwlpZiAocikKIAkJcmluZy0+cmVhZHkgPSBmYWxzZTsKLQkJcmV0dXJuIHI7 Ci0JfQogCi0JcmV0dXJuIDA7CisJcmV0dXJuIHI7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92OF8w X2NwX2NvbXB1dGVfZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJs ZSkKQEAgLTQ5NzksOCArNDk3Myw2IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfaHdfaW5pdCh2b2lk ICpoYW5kbGUpCiAJCXJldHVybiByOwogCiAJciA9IGdmeF92OF8wX2NwX3Jlc3VtZShhZGV2KTsK LQlpZiAocikKLQkJcmV0dXJuIHI7CiAKIAlyZXR1cm4gcjsKIH0KQEAgLTUwMjgsMTUgKzUwMjAs MTIgQEAgc3RhdGljIGJvb2wgZ2Z4X3Y4XzBfaXNfaWRsZSh2b2lkICpoYW5kbGUpCiBzdGF0aWMg aW50IGdmeF92OF8wX3dhaXRfZm9yX2lkbGUodm9pZCAqaGFuZGxlKQogewogCXVuc2lnbmVkIGk7 Ci0JdTMyIHRtcDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqKWhhbmRsZTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51c2VjX3RpbWVvdXQ7 IGkrKykgewotCQkvKiByZWFkIE1DX1NUQVRVUyAqLwotCQl0bXAgPSBSUkVHMzIobW1HUkJNX1NU QVRVUykgJiBHUkJNX1NUQVRVU19fR1VJX0FDVElWRV9NQVNLOwotCi0JCWlmICghUkVHX0dFVF9G SUVMRCh0bXAsIEdSQk1fU1RBVFVTLCBHVUlfQUNUSVZFKSkKKwkJaWYgKGdmeF92OF8wX2lzX2lk bGUoaGFuZGxlKSkKIAkJCXJldHVybiAwOworCiAJCXVkZWxheSgxKTsKIAl9CiAJcmV0dXJuIC1F VElNRURPVVQ7CkBAIC01OTY3LDI1ICs1OTU2LDE4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc2V0 X2Nsb2NrZ2F0aW5nX3N0YXRlKHZvaWQgKmhhbmRsZSwKIAogc3RhdGljIHUzMiBnZnhfdjhfMF9y aW5nX2dldF9ycHRyX2dmeChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7Ci0JdTMyIHJwdHI7 Ci0KLQlycHRyID0gcmluZy0+YWRldi0+d2Iud2JbcmluZy0+cnB0cl9vZmZzXTsKLQotCXJldHVy biBycHRyOworCXJldHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5nLT5ycHRyX29mZnNdOwogfQog CiBzdGF0aWMgdTMyIGdmeF92OF8wX3JpbmdfZ2V0X3dwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmlu ZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7Ci0J dTMyIHdwdHI7CiAKIAlpZiAocmluZy0+dXNlX2Rvb3JiZWxsKQogCQkvKiBYWFggY2hlY2sgaWYg c3dhcHBpbmcgaXMgbmVjZXNzYXJ5IG9uIEJFICovCi0JCXdwdHIgPSByaW5nLT5hZGV2LT53Yi53 YltyaW5nLT53cHRyX29mZnNdOworCQlyZXR1cm4gcmluZy0+YWRldi0+d2Iud2JbcmluZy0+d3B0 cl9vZmZzXTsKIAllbHNlCi0JCXdwdHIgPSBSUkVHMzIobW1DUF9SQjBfV1BUUik7Ci0KLQlyZXR1 cm4gd3B0cjsKKwkJcmV0dXJuIFJSRUczMihtbUNQX1JCMF9XUFRSKTsKIH0KIAogc3RhdGljIHZv aWQgZ2Z4X3Y4XzBfcmluZ19zZXRfd3B0cl9nZngoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQpA QCAtNjU4MSwxNSArNjU2MywxMiBAQCBzdGF0aWMgdTMyIGdmeF92OF8wX2dldF9jdV9hY3RpdmVf Yml0bWFwKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXUzMiBkYXRhLCBtYXNrOwog Ci0JZGF0YSA9IFJSRUczMihtbUNDX0dDX1NIQURFUl9BUlJBWV9DT05GSUcpOwotCWRhdGEgfD0g UlJFRzMyKG1tR0NfVVNFUl9TSEFERVJfQVJSQVlfQ09ORklHKTsKLQotCWRhdGEgJj0gQ0NfR0Nf U0hBREVSX0FSUkFZX0NPTkZJR19fSU5BQ1RJVkVfQ1VTX01BU0s7Ci0JZGF0YSA+Pj0gQ0NfR0Nf U0hBREVSX0FSUkFZX0NPTkZJR19fSU5BQ1RJVkVfQ1VTX19TSElGVDsKKwlkYXRhID0gIFJSRUcz MihtbUNDX0dDX1NIQURFUl9BUlJBWV9DT05GSUcpIHwKKwkJUlJFRzMyKG1tR0NfVVNFUl9TSEFE RVJfQVJSQVlfQ09ORklHKTsKIAogCW1hc2sgPSBnZnhfdjhfMF9jcmVhdGVfYml0bWFzayhhZGV2 LT5nZnguY29uZmlnLm1heF9jdV9wZXJfc2gpOwogCi0JcmV0dXJuICh+ZGF0YSkgJiBtYXNrOwor CXJldHVybiB+UkVHX0dFVF9GSUVMRChkYXRhLCBDQ19HQ19TSEFERVJfQVJSQVlfQ09ORklHLCBJ TkFDVElWRV9DVVMpICYgbWFzazsKIH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfZ2V0X2N1X2lu Zm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCi0tIAoyLjkuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==