From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunming Zhou Subject: [PATCH 1/2] drm/amdgpu: Don't change preferred domian when fallback GTT v6 Date: Tue, 3 Apr 2018 17:24:52 +0800 Message-ID: <20180403092453.15889-1-david1.zhou@amd.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: Chunming Zhou , felix.kuehling-5C7GfCeVMHo@public.gmane.org djI6IGFkZCBzYW5pdHkgY2hlY2tpbmcKdjM6IG1ha2UgY29kZSBvcGVuCnY0OiBhbHNvIGhhbmRs ZSB2aXNpYmxlIHRvIGludmlzaWJsZSBmYWxsYmFjawp2NTogU2luY2UgdHdvIGZhbGxiYWNrIGNh c2VzLCByZS11c2UgZ290byByZXRyeQp2NjogYXZvaWQgYm8gaXMgdW5yZWYgd2hlbiByZXRyeSwg YW5kIG9ubHkgdXNlciBCTyBjYW4gZmFsbGJhY2sKCkNoYW5nZS1JZDogSTJjZjY3MmFkMzZiOGI0 Y2MxYTZiMmU3MDRmNzg2YmY2YTE1NWQ5Y2UKU2lnbmVkLW9mZi1ieTogQ2h1bm1pbmcgWmhvdSA8 ZGF2aWQxLnpob3VAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlz dGlhbi5rb2VuaWdAYW1kLmNvbT4gKHY1KQpDYzogZmVsaXgua3VlaGxpbmdAYW1kLmNvbQotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYyAgICB8IDE2ICsrLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyB8IDM3ICsr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRp b25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf Z2VtLmMKaW5kZXggNDZiOWVhNGU2MTAzLi4yOGMyNzA2ZTQ4ZDcgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMKQEAgLTU2LDIzICs1NiwxMSBAQCBpbnQgYW1kZ3B1X2dl bV9vYmplY3RfY3JlYXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1bnNpZ25lZCBsb25n IHNpemUsCiAJCWFsaWdubWVudCA9IFBBR0VfU0laRTsKIAl9CiAKLXJldHJ5OgogCXIgPSBhbWRn cHVfYm9fY3JlYXRlKGFkZXYsIHNpemUsIGFsaWdubWVudCwgaW5pdGlhbF9kb21haW4sCiAJCQkg ICAgIGZsYWdzLCB0eXBlLCByZXN2LCAmYm8pOwogCWlmIChyKSB7Ci0JCWlmIChyICE9IC1FUkVT VEFSVFNZUykgewotCQkJaWYgKGZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19S RVFVSVJFRCkgewotCQkJCWZsYWdzICY9IH5BTURHUFVfR0VNX0NSRUFURV9DUFVfQUNDRVNTX1JF UVVJUkVEOwotCQkJCWdvdG8gcmV0cnk7Ci0JCQl9Ci0KLQkJCWlmIChpbml0aWFsX2RvbWFpbiA9 PSBBTURHUFVfR0VNX0RPTUFJTl9WUkFNKSB7Ci0JCQkJaW5pdGlhbF9kb21haW4gfD0gQU1ER1BV X0dFTV9ET01BSU5fR1RUOwotCQkJCWdvdG8gcmV0cnk7Ci0JCQl9Ci0JCQlEUk1fREVCVUcoIkZh aWxlZCB0byBhbGxvY2F0ZSBHRU0gb2JqZWN0ICglbGQsICVkLCAldSwgJWQpXG4iLAotCQkJCSAg c2l6ZSwgaW5pdGlhbF9kb21haW4sIGFsaWdubWVudCwgcik7Ci0JCX0KKwkJRFJNX0RFQlVHKCJG YWlsZWQgdG8gYWxsb2NhdGUgR0VNIG9iamVjdCAoJWxkLCAlZCwgJXUsICVkKVxuIiwKKwkJCSAg c2l6ZSwgaW5pdGlhbF9kb21haW4sIGFsaWdubWVudCwgcik7CiAJCXJldHVybiByOwogCX0KIAkq b2JqID0gJmJvLT5nZW1fYmFzZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9vYmplY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9v YmplY3QuYwppbmRleCBhYzFmYTMzOTRhOWUuLmYwNGJmYWIxZWViZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwpAQCAtMzUyLDYgKzM1Miw3IEBAIHN0YXRp YyBpbnQgYW1kZ3B1X2JvX2RvX2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdW5z aWduZWQgbG9uZyBzaXplLAogCXN0cnVjdCBhbWRncHVfYm8gKmJvOwogCXVuc2lnbmVkIGxvbmcg cGFnZV9hbGlnbjsKIAlzaXplX3QgYWNjX3NpemU7CisJdTMyIGRvbWFpbnMsIHByZWZlcnJlZF9k b21haW5zLCBhbGxvd2VkX2RvbWFpbnM7CiAJaW50IHI7CiAKIAlwYWdlX2FsaWduID0gcm91bmR1 cChieXRlX2FsaWduLCBQQUdFX1NJWkUpID4+IFBBR0VfU0hJRlQ7CkBAIC0zNjUsMjIgKzM2Niwy NCBAQCBzdGF0aWMgaW50IGFtZGdwdV9ib19kb19jcmVhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsIHVuc2lnbmVkIGxvbmcgc2l6ZSwKIAlhY2Nfc2l6ZSA9IHR0bV9ib19kbWFfYWNjX3Np emUoJmFkZXYtPm1tYW4uYmRldiwgc2l6ZSwKIAkJCQkgICAgICAgc2l6ZW9mKHN0cnVjdCBhbWRn cHVfYm8pKTsKIAorCXByZWZlcnJlZF9kb21haW5zID0gZG9tYWluICYgKEFNREdQVV9HRU1fRE9N QUlOX1ZSQU0gfAorCQkJCSAgICAgIEFNREdQVV9HRU1fRE9NQUlOX0dUVCB8CisJCQkJICAgICAg QU1ER1BVX0dFTV9ET01BSU5fQ1BVIHwKKwkJCQkgICAgICBBTURHUFVfR0VNX0RPTUFJTl9HRFMg fAorCQkJCSAgICAgIEFNREdQVV9HRU1fRE9NQUlOX0dXUyB8CisJCQkJICAgICAgQU1ER1BVX0dF TV9ET01BSU5fT0EpOworCWFsbG93ZWRfZG9tYWlucyA9IHByZWZlcnJlZF9kb21haW5zOworCWlm ICh0eXBlICE9IHR0bV9ib190eXBlX2tlcm5lbCAmJgorCSAgICBhbGxvd2VkX2RvbWFpbnMgPT0g QU1ER1BVX0dFTV9ET01BSU5fVlJBTSkKKwkJYWxsb3dlZF9kb21haW5zIHw9IEFNREdQVV9HRU1f RE9NQUlOX0dUVDsKKwlkb21haW5zID0gcHJlZmVycmVkX2RvbWFpbnM7CityZXRyeToKIAlibyA9 IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCBhbWRncHVfYm8pLCBHRlBfS0VSTkVMKTsKIAlpZiAoYm8g PT0gTlVMTCkKIAkJcmV0dXJuIC1FTk9NRU07CiAJZHJtX2dlbV9wcml2YXRlX29iamVjdF9pbml0 KGFkZXYtPmRkZXYsICZiby0+Z2VtX2Jhc2UsIHNpemUpOwogCUlOSVRfTElTVF9IRUFEKCZiby0+ c2hhZG93X2xpc3QpOwogCUlOSVRfTElTVF9IRUFEKCZiby0+dmEpOwotCWJvLT5wcmVmZXJyZWRf ZG9tYWlucyA9IGRvbWFpbiAmIChBTURHUFVfR0VNX0RPTUFJTl9WUkFNIHwKLQkJCQkJIEFNREdQ VV9HRU1fRE9NQUlOX0dUVCB8Ci0JCQkJCSBBTURHUFVfR0VNX0RPTUFJTl9DUFUgfAotCQkJCQkg QU1ER1BVX0dFTV9ET01BSU5fR0RTIHwKLQkJCQkJIEFNREdQVV9HRU1fRE9NQUlOX0dXUyB8Ci0J CQkJCSBBTURHUFVfR0VNX0RPTUFJTl9PQSk7Ci0JYm8tPmFsbG93ZWRfZG9tYWlucyA9IGJvLT5w cmVmZXJyZWRfZG9tYWluczsKLQlpZiAodHlwZSAhPSB0dG1fYm9fdHlwZV9rZXJuZWwgJiYKLQkg ICAgYm8tPmFsbG93ZWRfZG9tYWlucyA9PSBBTURHUFVfR0VNX0RPTUFJTl9WUkFNKQotCQliby0+ YWxsb3dlZF9kb21haW5zIHw9IEFNREdQVV9HRU1fRE9NQUlOX0dUVDsKIAogCWJvLT5mbGFncyA9 IGZsYWdzOwogCkBAIC00MTMsMTIgKzQxNiwyMCBAQCBzdGF0aWMgaW50IGFtZGdwdV9ib19kb19j cmVhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVuc2lnbmVkIGxvbmcgc2l6ZSwKICNl bmRpZgogCiAJYm8tPnRiby5iZGV2ID0gJmFkZXYtPm1tYW4uYmRldjsKLQlhbWRncHVfdHRtX3Bs YWNlbWVudF9mcm9tX2RvbWFpbihibywgZG9tYWluKTsKLQorCWFtZGdwdV90dG1fcGxhY2VtZW50 X2Zyb21fZG9tYWluKGJvLCBkb21haW5zKTsKIAlyID0gdHRtX2JvX2luaXRfcmVzZXJ2ZWQoJmFk ZXYtPm1tYW4uYmRldiwgJmJvLT50Ym8sIHNpemUsIHR5cGUsCiAJCQkJICZiby0+cGxhY2VtZW50 LCBwYWdlX2FsaWduLCAmY3R4LCBhY2Nfc2l6ZSwKIAkJCQkgTlVMTCwgcmVzdiwgJmFtZGdwdV90 dG1fYm9fZGVzdHJveSk7Ci0JaWYgKHVubGlrZWx5KHIgIT0gMCkpCisJaWYgKHVubGlrZWx5KHIg JiYgciAhPSAtRVJFU1RBUlRTWVMpICYmIHR5cGUgPT0gdHRtX2JvX3R5cGVfZGV2aWNlKSB7CisJ CWlmIChmbGFncyAmIEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9BQ0NFU1NfUkVRVUlSRUQpIHsKKwkJ CWZsYWdzICY9IH5BTURHUFVfR0VNX0NSRUFURV9DUFVfQUNDRVNTX1JFUVVJUkVEOworCQkJZ290 byByZXRyeTsKKwkJfSBlbHNlIGlmIChkb21haW5zICE9IGFsbG93ZWRfZG9tYWlucykgeworCQkJ ZG9tYWlucyA9IGFsbG93ZWRfZG9tYWluczsKKwkJCWdvdG8gcmV0cnk7CisJCX0KKwl9CisJaWYg KHVubGlrZWx5KHIpKQogCQlyZXR1cm4gcjsKIAogCWlmIChhZGV2LT5nbWMudmlzaWJsZV92cmFt X3NpemUgPCBhZGV2LT5nbWMucmVhbF92cmFtX3NpemUgJiYKLS0gCjIuMTQuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxp c3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==