From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH] drm/amdgpu: cleanup VMHUB bit definitions v2 Date: Tue, 4 Apr 2017 15:20:08 +0200 Message-ID: <1491312008-19732-1-git-send-email-deathsimple@vodafone.de> 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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhlIHR3 byBodWJzIGFyZSBqdXN0IGluc3RhbmNlcyBvZiB0aGUgc2FtZSBoYXJkd2FyZSwKc28gdGhlIHJl Z2lzdGVyIGJpdHMgYXJlIGlkZW50aWNhbC4KCnYyOiBvbmx5IHJlbW92ZSBnZXRfdm1fcHJvdGVj dGlvbl9iaXRzIGZvciBub3cKClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlz dGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHUuaCAgICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4aHViX3YxXzAu YyB8IDEyIC0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAu YyAgICB8IDEyICsrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbW1odWJf djFfMC5jICB8IDEyIC0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMo KyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXgg Y2M0M2ZlZS4uMGM4OWU2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTU3 Myw3ICs1NzMsNiBAQCBzdHJ1Y3QgYW1kZ3B1X3ZtaHViIHsKIAl1aW50MzJfdAl2bV9sMl9wcm9f ZmF1bHRfc3RhdHVzOwogCXVpbnQzMl90CXZtX2wyX3Byb19mYXVsdF9jbnRsOwogCXVpbnQzMl90 CSgqZ2V0X2ludmFsaWRhdGVfcmVxKSh1bnNpZ25lZCBpbnQgdm1faWQpOwotCXVpbnQzMl90CSgq Z2V0X3ZtX3Byb3RlY3Rpb25fYml0cykodm9pZCk7CiB9OwogCiAvKgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4aHViX3YxXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeGh1Yl92MV8wLmMKaW5kZXggMzBlZjMxMi4uYjgwOGQ0YyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4aHViX3YxXzAuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhodWJfdjFfMC5jCkBAIC0zMTgsMTcgKzMxOCw2IEBAIHN0 YXRpYyB1aW50MzJfdCBnZnhodWJfdjFfMF9nZXRfaW52YWxpZGF0ZV9yZXEodW5zaWduZWQgaW50 IHZtX2lkKQogCXJldHVybiByZXE7CiB9CiAKLXN0YXRpYyB1aW50MzJfdCBnZnhodWJfdjFfMF9n ZXRfdm1fcHJvdGVjdGlvbl9iaXRzKHZvaWQpCi17Ci0JcmV0dXJuIChWTV9DT05URVhUMV9DTlRM X19SQU5HRV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFTSyB8Ci0JCSAgICBW TV9DT05URVhUMV9DTlRMX19EVU1NWV9QQUdFX1BST1RFQ1RJT05fRkFVTFRfRU5BQkxFX0lOVEVS UlVQVF9NQVNLIHwKLQkJICAgIFZNX0NPTlRFWFQxX0NOVExfX1BERTBfUFJPVEVDVElPTl9GQVVM VF9FTkFCTEVfSU5URVJSVVBUX01BU0sgfAotCQkgICAgVk1fQ09OVEVYVDFfQ05UTF9fVkFMSURf UFJPVEVDVElPTl9GQVVMVF9FTkFCTEVfSU5URVJSVVBUX01BU0sgfAotCQkgICAgVk1fQ09OVEVY VDFfQ05UTF9fUkVBRF9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFTSyB8Ci0J CSAgICBWTV9DT05URVhUMV9DTlRMX19XUklURV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRF UlJVUFRfTUFTSyB8Ci0JCSAgICBWTV9DT05URVhUMV9DTlRMX19FWEVDVVRFX1BST1RFQ1RJT05f RkFVTFRfRU5BQkxFX0lOVEVSUlVQVF9NQVNLKTsKLX0KLQogc3RhdGljIGludCBnZnhodWJfdjFf MF9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkKIHsKIAlyZXR1cm4gMDsKQEAgLTM2Miw3ICszNTEs NiBAQCBzdGF0aWMgaW50IGdmeGh1Yl92MV8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlTT0Mx NV9SRUdfT0ZGU0VUKEdDLCAwLCBtbVZNX0wyX1BST1RFQ1RJT05fRkFVTFRfQ05UTCk7CiAKIAlo dWItPmdldF9pbnZhbGlkYXRlX3JlcSA9IGdmeGh1Yl92MV8wX2dldF9pbnZhbGlkYXRlX3JlcTsK LQlodWItPmdldF92bV9wcm90ZWN0aW9uX2JpdHMgPSBnZnhodWJfdjFfMF9nZXRfdm1fcHJvdGVj dGlvbl9iaXRzOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjlfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5 XzAuYwppbmRleCAyNjhjZWRiLi5kODEzNzIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjlfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dt Y192OV8wLmMKQEAgLTc1LDExICs3NSwxOCBAQCBzdGF0aWMgaW50IGdtY192OV8wX3ZtX2ZhdWx0 X2ludGVycnVwdF9zdGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlzdHJ1Y3QgYW1k Z3B1X3ZtaHViICpodWI7CiAJdTMyIHRtcCwgcmVnLCBiaXRzLCBpOwogCisJYml0cyA9IFZNX0NP TlRFWFQxX0NOVExfX1JBTkdFX1BST1RFQ1RJT05fRkFVTFRfRU5BQkxFX0lOVEVSUlVQVF9NQVNL IHwKKwkJVk1fQ09OVEVYVDFfQ05UTF9fRFVNTVlfUEFHRV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJM RV9JTlRFUlJVUFRfTUFTSyB8CisJCVZNX0NPTlRFWFQxX0NOVExfX1BERTBfUFJPVEVDVElPTl9G QVVMVF9FTkFCTEVfSU5URVJSVVBUX01BU0sgfAorCQlWTV9DT05URVhUMV9DTlRMX19WQUxJRF9Q Uk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFTSyB8CisJCVZNX0NPTlRFWFQxX0NO VExfX1JFQURfUFJPVEVDVElPTl9GQVVMVF9FTkFCTEVfSU5URVJSVVBUX01BU0sgfAorCQlWTV9D T05URVhUMV9DTlRMX19XUklURV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFT SyB8CisJCVZNX0NPTlRFWFQxX0NOVExfX0VYRUNVVEVfUFJPVEVDVElPTl9GQVVMVF9FTkFCTEVf SU5URVJSVVBUX01BU0s7CisKIAlzd2l0Y2ggKHN0YXRlKSB7CiAJY2FzZSBBTURHUFVfSVJRX1NU QVRFX0RJU0FCTEU6CiAJCS8qIE1NIEhVQiAqLwogCQlodWIgPSAmYWRldi0+dm1odWJbQU1ER1BV X01NSFVCXTsKLQkJYml0cyA9IGh1Yi0+Z2V0X3ZtX3Byb3RlY3Rpb25fYml0cygpOwogCQlmb3Ig KGkgPSAwOyBpPCAxNjsgaSsrKSB7CiAJCQlyZWcgPSBodWItPnZtX2NvbnRleHQwX2NudGwgKyBp OwogCQkJdG1wID0gUlJFRzMyKHJlZyk7CkBAIC04OSw3ICs5Niw2IEBAIHN0YXRpYyBpbnQgZ21j X3Y5XzBfdm1fZmF1bHRfaW50ZXJydXB0X3N0YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAogCiAJCS8qIEdGWCBIVUIgKi8KIAkJaHViID0gJmFkZXYtPnZtaHViW0FNREdQVV9HRlhIVUJd OwotCQliaXRzID0gaHViLT5nZXRfdm1fcHJvdGVjdGlvbl9iaXRzKCk7CiAJCWZvciAoaSA9IDA7 IGkgPCAxNjsgaSsrKSB7CiAJCQlyZWcgPSBodWItPnZtX2NvbnRleHQwX2NudGwgKyBpOwogCQkJ dG1wID0gUlJFRzMyKHJlZyk7CkBAIC0xMDAsNyArMTA2LDYgQEAgc3RhdGljIGludCBnbWNfdjlf MF92bV9mYXVsdF9pbnRlcnJ1cHRfc3RhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJ Y2FzZSBBTURHUFVfSVJRX1NUQVRFX0VOQUJMRToKIAkJLyogTU0gSFVCICovCiAJCWh1YiA9ICZh ZGV2LT52bWh1YltBTURHUFVfTU1IVUJdOwotCQliaXRzID0gaHViLT5nZXRfdm1fcHJvdGVjdGlv bl9iaXRzKCk7CiAJCWZvciAoaSA9IDA7IGk8IDE2OyBpKyspIHsKIAkJCXJlZyA9IGh1Yi0+dm1f Y29udGV4dDBfY250bCArIGk7CiAJCQl0bXAgPSBSUkVHMzIocmVnKTsKQEAgLTExMCw3ICsxMTUs NiBAQCBzdGF0aWMgaW50IGdtY192OV8wX3ZtX2ZhdWx0X2ludGVycnVwdF9zdGF0ZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKIAogCQkvKiBHRlggSFVCICovCiAJCWh1YiA9ICZhZGV2LT52 bWh1YltBTURHUFVfR0ZYSFVCXTsKLQkJYml0cyA9IGh1Yi0+Z2V0X3ZtX3Byb3RlY3Rpb25fYml0 cygpOwogCQlmb3IgKGkgPSAwOyBpIDwgMTY7IGkrKykgewogCQkJcmVnID0gaHViLT52bV9jb250 ZXh0MF9jbnRsICsgaTsKIAkJCXRtcCA9IFJSRUczMihyZWcpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvbW1odWJfdjFfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvbW1odWJfdjFfMC5jCmluZGV4IDI2NmEwZjQuLmEwNjViNDMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L21taHViX3YxXzAuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9tbWh1Yl92MV8wLmMKQEAgLTMzNiwxNyArMzM2LDYgQEAgc3RhdGljIHVp bnQzMl90IG1taHViX3YxXzBfZ2V0X2ludmFsaWRhdGVfcmVxKHVuc2lnbmVkIGludCB2bV9pZCkK IAlyZXR1cm4gcmVxOwogfQogCi1zdGF0aWMgdWludDMyX3QgbW1odWJfdjFfMF9nZXRfdm1fcHJv dGVjdGlvbl9iaXRzKHZvaWQpCi17Ci0JcmV0dXJuIChWTV9DT05URVhUMV9DTlRMX19SQU5HRV9Q Uk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFTSyB8Ci0JCSAgICBWTV9DT05URVhU MV9DTlRMX19EVU1NWV9QQUdFX1BST1RFQ1RJT05fRkFVTFRfRU5BQkxFX0lOVEVSUlVQVF9NQVNL IHwKLQkJICAgIFZNX0NPTlRFWFQxX0NOVExfX1BERTBfUFJPVEVDVElPTl9GQVVMVF9FTkFCTEVf SU5URVJSVVBUX01BU0sgfAotCQkgICAgVk1fQ09OVEVYVDFfQ05UTF9fVkFMSURfUFJPVEVDVElP Tl9GQVVMVF9FTkFCTEVfSU5URVJSVVBUX01BU0sgfAotCQkgICAgVk1fQ09OVEVYVDFfQ05UTF9f UkVBRF9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFTSyB8Ci0JCSAgICBWTV9D T05URVhUMV9DTlRMX19XUklURV9QUk9URUNUSU9OX0ZBVUxUX0VOQUJMRV9JTlRFUlJVUFRfTUFT SyB8Ci0JCSAgICBWTV9DT05URVhUMV9DTlRMX19FWEVDVVRFX1BST1RFQ1RJT05fRkFVTFRfRU5B QkxFX0lOVEVSUlVQVF9NQVNLKTsKLX0KLQogc3RhdGljIGludCBtbWh1Yl92MV8wX2Vhcmx5X2lu aXQodm9pZCAqaGFuZGxlKQogewogCXJldHVybiAwOwpAQCAtMzgwLDcgKzM2OSw2IEBAIHN0YXRp YyBpbnQgbW1odWJfdjFfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJU09DMTVfUkVHX09GRlNF VChNTUhVQiwgMCwgbW1WTV9MMl9QUk9URUNUSU9OX0ZBVUxUX0NOVEwpOwogCiAJaHViLT5nZXRf aW52YWxpZGF0ZV9yZXEgPSBtbWh1Yl92MV8wX2dldF9pbnZhbGlkYXRlX3JlcTsKLQlodWItPmdl dF92bV9wcm90ZWN0aW9uX2JpdHMgPSBtbWh1Yl92MV8wX2dldF92bV9wcm90ZWN0aW9uX2JpdHM7 CiAKIAlyZXR1cm4gMDsKIH0KLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK