From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/5] drm/amdgpu: cleanup amdgpu_ttm_placement_init Date: Thu, 18 Aug 2016 11:59:15 +0200 Message-ID: <1471514358-2131-2-git-send-email-deathsimple@vodafone.de> References: <1471514358-2131-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1471514358-2131-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKTWFrZSBp dCBtb3JlIGNsZWFyIHdoYXQgdGhpcyBmdW5jdGlvbiBkb2VzLiBObyBpbnRlbmRldCBmdW5jdGlv bmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5r b2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2Jq ZWN0LmMgfCAxMTIgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA2MCBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfb2JqZWN0LmMKaW5kZXggNGQwODRlZS4uZTdhNmEyZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwpAQCAtMTExLDg3ICsxMTEsOTUg QEAgYm9vbCBhbWRncHVfdHRtX2JvX2lzX2FtZGdwdV9ibyhzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmpl Y3QgKmJvKQogCiBzdGF0aWMgdm9pZCBhbWRncHVfdHRtX3BsYWNlbWVudF9pbml0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LAogCQkJCSAgICAgIHN0cnVjdCB0dG1fcGxhY2VtZW50ICpwbGFj ZW1lbnQsCi0JCQkJICAgICAgc3RydWN0IHR0bV9wbGFjZSAqcGxhY2VtZW50cywKKwkJCQkgICAg ICBzdHJ1Y3QgdHRtX3BsYWNlICpwbGFjZXMsCiAJCQkJICAgICAgdTMyIGRvbWFpbiwgdTY0IGZs YWdzKQogewogCXUzMiBjID0gMCwgaTsKIAotCXBsYWNlbWVudC0+cGxhY2VtZW50ID0gcGxhY2Vt ZW50czsKLQlwbGFjZW1lbnQtPmJ1c3lfcGxhY2VtZW50ID0gcGxhY2VtZW50czsKLQogCWlmIChk b21haW4gJiBBTURHUFVfR0VNX0RPTUFJTl9WUkFNKSB7CisJCXVuc2lnbmVkIHZpc2libGVfcGZu ID0gYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPj4gUEFHRV9TSElGVDsKKwogCQlpZiAoZmxh Z3MgJiBBTURHUFVfR0VNX0NSRUFURV9OT19DUFVfQUNDRVNTICYmCi0JCQlhZGV2LT5tYy52aXNp YmxlX3ZyYW1fc2l6ZSA8IGFkZXYtPm1jLnJlYWxfdnJhbV9zaXplKSB7Ci0JCQlwbGFjZW1lbnRz W2NdLmZwZm4gPQotCQkJCWFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplID4+IFBBR0VfU0hJRlQ7 Ci0JCQlwbGFjZW1lbnRzW2MrK10uZmxhZ3MgPSBUVE1fUExfRkxBR19XQyB8CisJCSAgICBhZGV2 LT5tYy52aXNpYmxlX3ZyYW1fc2l6ZSA8IGFkZXYtPm1jLnJlYWxfdnJhbV9zaXplKSB7CisJCQlw bGFjZXNbY10uZnBmbiA9IHZpc2libGVfcGZuOworCQkJaWYgKGZsYWdzICYgQU1ER1BVX0dFTV9D UkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkKKwkJCQlwbGFjZXNbY10ubHBmbiA9IHZpc2libGVf cGZuOworCQkJZWxzZQorCQkJCXBsYWNlc1tjXS5scGZuID0gMDsKKwkJCXBsYWNlc1tjXS5mbGFn cyA9IFRUTV9QTF9GTEFHX1dDIHwKIAkJCQlUVE1fUExfRkxBR19VTkNBQ0hFRCB8IFRUTV9QTF9G TEFHX1ZSQU0gfAogCQkJCVRUTV9QTF9GTEFHX1RPUERPV047CisJCQljKys7CiAJCX0KLQkJcGxh Y2VtZW50c1tjXS5mcGZuID0gMDsKLQkJcGxhY2VtZW50c1tjKytdLmZsYWdzID0gVFRNX1BMX0ZM QUdfV0MgfCBUVE1fUExfRkxBR19VTkNBQ0hFRCB8CisKKwkJcGxhY2VzW2NdLmZwZm4gPSAwOwor CQlwbGFjZXNbY10ubHBmbiA9IDA7CisJCXBsYWNlc1tjXS5mbGFncyA9IFRUTV9QTF9GTEFHX1dD IHwgVFRNX1BMX0ZMQUdfVU5DQUNIRUQgfAogCQkJVFRNX1BMX0ZMQUdfVlJBTTsKLQkJaWYgKCEo ZmxhZ3MgJiBBTURHUFVfR0VNX0NSRUFURV9DUFVfQUNDRVNTX1JFUVVJUkVEKSkKLQkJCXBsYWNl bWVudHNbYyAtIDFdLmZsYWdzIHw9IFRUTV9QTF9GTEFHX1RPUERPV047CisJCWlmIChmbGFncyAm IEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9BQ0NFU1NfUkVRVUlSRUQpCisJCQlwbGFjZXNbY10ubHBm biA9IHZpc2libGVfcGZuOworCQllbHNlCisJCQlwbGFjZXNbY10uZmxhZ3MgfD0gVFRNX1BMX0ZM QUdfVE9QRE9XTjsKKwkJYysrOwogCX0KIAogCWlmIChkb21haW4gJiBBTURHUFVfR0VNX0RPTUFJ Tl9HVFQpIHsKLQkJaWYgKGZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0dUVF9VU1dDKSB7 Ci0JCQlwbGFjZW1lbnRzW2NdLmZwZm4gPSAwOwotCQkJcGxhY2VtZW50c1tjKytdLmZsYWdzID0g VFRNX1BMX0ZMQUdfV0MgfAotCQkJCVRUTV9QTF9GTEFHX1RUIHwgVFRNX1BMX0ZMQUdfVU5DQUNI RUQ7Ci0JCX0gZWxzZSB7Ci0JCQlwbGFjZW1lbnRzW2NdLmZwZm4gPSAwOwotCQkJcGxhY2VtZW50 c1tjKytdLmZsYWdzID0gVFRNX1BMX0ZMQUdfQ0FDSEVEIHwKLQkJCQlUVE1fUExfRkxBR19UVDsK LQkJfQorCQlwbGFjZXNbY10uZnBmbiA9IDA7CisJCXBsYWNlc1tjXS5scGZuID0gMDsKKwkJcGxh Y2VzW2NdLmZsYWdzID0gVFRNX1BMX0ZMQUdfVFQ7CisJCWlmIChmbGFncyAmIEFNREdQVV9HRU1f Q1JFQVRFX0NQVV9HVFRfVVNXQykKKwkJCXBsYWNlc1tjXS5mbGFncyB8PSBUVE1fUExfRkxBR19X QyB8CisJCQkJVFRNX1BMX0ZMQUdfVU5DQUNIRUQ7CisJCWVsc2UKKwkJCXBsYWNlc1tjXS5mbGFn cyB8PSBUVE1fUExfRkxBR19DQUNIRUQ7CisJCWMrKzsKIAl9CiAKIAlpZiAoZG9tYWluICYgQU1E R1BVX0dFTV9ET01BSU5fQ1BVKSB7Ci0JCWlmIChmbGFncyAmIEFNREdQVV9HRU1fQ1JFQVRFX0NQ VV9HVFRfVVNXQykgewotCQkJcGxhY2VtZW50c1tjXS5mcGZuID0gMDsKLQkJCXBsYWNlbWVudHNb YysrXS5mbGFncyA9IFRUTV9QTF9GTEFHX1dDIHwKLQkJCQlUVE1fUExfRkxBR19TWVNURU0gfCBU VE1fUExfRkxBR19VTkNBQ0hFRDsKLQkJfSBlbHNlIHsKLQkJCXBsYWNlbWVudHNbY10uZnBmbiA9 IDA7Ci0JCQlwbGFjZW1lbnRzW2MrK10uZmxhZ3MgPSBUVE1fUExfRkxBR19DQUNIRUQgfAotCQkJ CVRUTV9QTF9GTEFHX1NZU1RFTTsKLQkJfQorCQlwbGFjZXNbY10uZnBmbiA9IDA7CisJCXBsYWNl c1tjXS5scGZuID0gMDsKKwkJcGxhY2VzW2NdLmZsYWdzID0gVFRNX1BMX0ZMQUdfU1lTVEVNOwor CQlpZiAoZmxhZ3MgJiBBTURHUFVfR0VNX0NSRUFURV9DUFVfR1RUX1VTV0MpCisJCQlwbGFjZXNb Y10uZmxhZ3MgfD0gVFRNX1BMX0ZMQUdfV0MgfAorCQkJCVRUTV9QTF9GTEFHX1VOQ0FDSEVEOwor CQllbHNlCisJCQlwbGFjZXNbY10uZmxhZ3MgfD0gVFRNX1BMX0ZMQUdfQ0FDSEVEOworCQljKys7 CiAJfQogCiAJaWYgKGRvbWFpbiAmIEFNREdQVV9HRU1fRE9NQUlOX0dEUykgewotCQlwbGFjZW1l bnRzW2NdLmZwZm4gPSAwOwotCQlwbGFjZW1lbnRzW2MrK10uZmxhZ3MgPSBUVE1fUExfRkxBR19V TkNBQ0hFRCB8Ci0JCQlBTURHUFVfUExfRkxBR19HRFM7CisJCXBsYWNlc1tjXS5mcGZuID0gMDsK KwkJcGxhY2VzW2NdLmxwZm4gPSAwOworCQlwbGFjZXNbY10uZmxhZ3MgPSBUVE1fUExfRkxBR19V TkNBQ0hFRCB8IEFNREdQVV9QTF9GTEFHX0dEUzsKKwkJYysrOwogCX0KKwogCWlmIChkb21haW4g JiBBTURHUFVfR0VNX0RPTUFJTl9HV1MpIHsKLQkJcGxhY2VtZW50c1tjXS5mcGZuID0gMDsKLQkJ cGxhY2VtZW50c1tjKytdLmZsYWdzID0gVFRNX1BMX0ZMQUdfVU5DQUNIRUQgfAotCQkJQU1ER1BV X1BMX0ZMQUdfR1dTOworCQlwbGFjZXNbY10uZnBmbiA9IDA7CisJCXBsYWNlc1tjXS5scGZuID0g MDsKKwkJcGxhY2VzW2NdLmZsYWdzID0gVFRNX1BMX0ZMQUdfVU5DQUNIRUQgfCBBTURHUFVfUExf RkxBR19HV1M7CisJCWMrKzsKIAl9CisKIAlpZiAoZG9tYWluICYgQU1ER1BVX0dFTV9ET01BSU5f T0EpIHsKLQkJcGxhY2VtZW50c1tjXS5mcGZuID0gMDsKLQkJcGxhY2VtZW50c1tjKytdLmZsYWdz ID0gVFRNX1BMX0ZMQUdfVU5DQUNIRUQgfAotCQkJQU1ER1BVX1BMX0ZMQUdfT0E7CisJCXBsYWNl c1tjXS5mcGZuID0gMDsKKwkJcGxhY2VzW2NdLmxwZm4gPSAwOworCQlwbGFjZXNbY10uZmxhZ3Mg PSBUVE1fUExfRkxBR19VTkNBQ0hFRCB8IEFNREdQVV9QTF9GTEFHX09BOworCQljKys7CiAJfQog CiAJaWYgKCFjKSB7Ci0JCXBsYWNlbWVudHNbY10uZnBmbiA9IDA7Ci0JCXBsYWNlbWVudHNbYysr XS5mbGFncyA9IFRUTV9QTF9NQVNLX0NBQ0hJTkcgfAotCQkJVFRNX1BMX0ZMQUdfU1lTVEVNOwor CQlwbGFjZXNbY10uZnBmbiA9IDA7CisJCXBsYWNlc1tjXS5scGZuID0gMDsKKwkJcGxhY2VzW2Nd LmZsYWdzID0gVFRNX1BMX01BU0tfQ0FDSElORyB8IFRUTV9QTF9GTEFHX1NZU1RFTTsKKwkJYysr OwogCX0KKwogCXBsYWNlbWVudC0+bnVtX3BsYWNlbWVudCA9IGM7Ci0JcGxhY2VtZW50LT5udW1f YnVzeV9wbGFjZW1lbnQgPSBjOworCXBsYWNlbWVudC0+cGxhY2VtZW50ID0gcGxhY2VzOwogCi0J Zm9yIChpID0gMDsgaSA8IGM7IGkrKykgewotCQlpZiAoKGZsYWdzICYgQU1ER1BVX0dFTV9DUkVB VEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkgJiYKLQkJCShwbGFjZW1lbnRzW2ldLmZsYWdzICYgVFRN X1BMX0ZMQUdfVlJBTSkgJiYKLQkJCSFwbGFjZW1lbnRzW2ldLmZwZm4pCi0JCQlwbGFjZW1lbnRz W2ldLmxwZm4gPQotCQkJCWFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplID4+IFBBR0VfU0hJRlQ7 Ci0JCWVsc2UKLQkJCXBsYWNlbWVudHNbaV0ubHBmbiA9IDA7Ci0JfQorCXBsYWNlbWVudC0+bnVt X2J1c3lfcGxhY2VtZW50ID0gYzsKKwlwbGFjZW1lbnQtPmJ1c3lfcGxhY2VtZW50ID0gcGxhY2Vz OwogfQogCiB2b2lkIGFtZGdwdV90dG1fcGxhY2VtZW50X2Zyb21fZG9tYWluKHN0cnVjdCBhbWRn cHVfYm8gKnJibywgdTMyIGRvbWFpbikKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK