From mboxrd@z Thu Jan 1 00:00:00 1970 From: Huang Rui Subject: [PATCH v2 11/15] drm/amdgpu: use vram_type instead of checking mem_gddr5 flag Date: Wed, 31 Aug 2016 13:23:23 +0800 Message-ID: <1472621007-17578-12-git-send-email-ray.huang@amd.com> References: <1472621007-17578-1-git-send-email-ray.huang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1472621007-17578-1-git-send-email-ray.huang-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, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Cc: Ken Wang , Hui Yu , Huang Rui , Alvin Huan Rm9yIGN1cnJlbnQgZGVzaWduLCBpdCB3b3VsZCBiZXR0ZXIgdXNlIHZyYW1fdHlwZSBtZW1iZXIg dG8gY2hlY2sgaWYKY3VycmVudCB2cmFtIGlzIEdERFI1LiBTbyByZW1vdmUgdGhlIG9sZCBtZW1f Z2RkcjUgZmxhZy4KClNpZ25lZC1vZmYtYnk6IEh1YW5nIFJ1aSA8cmF5Lmh1YW5nQGFtZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgfCAxMiArKysrKystLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwppbmRleCBlY2UyNTI3Li5lMWIyYWI1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwpAQCAtNDM3NSw3ICs0Mzc1LDcgQEAgc3RhdGljIHU4 IHNpX2dldF9zdHJvYmVfbW9kZV9zZXR0aW5ncyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwg dTMyIG1jbGspCiAJaWYgKG1jbGsgPD0gcGktPm1jbGtfc3Ryb2JlX21vZGVfdGhyZXNob2xkKQog CQlzdHJvYmVfbW9kZSA9IHRydWU7CiAKLQlpZiAocGktPm1lbV9nZGRyNSkKKwlpZiAoYWRldi0+ bWMudnJhbV90eXBlID09IEFNREdQVV9WUkFNX1RZUEVfR0REUjUpCiAJCXJlc3VsdCA9IHNpX2dl dF9tY2xrX2ZyZXF1ZW5jeV9yYXRpbyhtY2xrLCBzdHJvYmVfbW9kZSk7CiAJZWxzZQogCQlyZXN1 bHQgPSBzaV9nZXRfZGRyM19tY2xrX2ZyZXF1ZW5jeV9yYXRpbyhtY2xrKTsKQEAgLTQ5NjUsNyAr NDk2NSw3IEBAIHN0YXRpYyBpbnQgc2lfcG9wdWxhdGVfc21jX2luaXRpYWxfc3RhdGUoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAl0YWJsZS0+aW5pdGlhbFN0YXRlLmxldmVsc1swXS5n ZW4yUENJRSA9ICh1OClzaV9waS0+Ym9vdF9wY2llX2dlbjsKIAotCWlmIChwaS0+bWVtX2dkZHI1 KSB7CisJaWYgKGFkZXYtPm1jLnZyYW1fdHlwZSA9PSBBTURHUFVfVlJBTV9UWVBFX0dERFI1KSB7 CiAJCXRhYmxlLT5pbml0aWFsU3RhdGUubGV2ZWxzWzBdLnN0cm9iZU1vZGUgPQogCQkJc2lfZ2V0 X3N0cm9iZV9tb2RlX3NldHRpbmdzKGFkZXYsCiAJCQkJCQkgICAgaW5pdGlhbF9zdGF0ZS0+cGVy Zm9ybWFuY2VfbGV2ZWxzWzBdLm1jbGspOwpAQCAtNTIzNyw3ICs1MjM3LDcgQEAgc3RhdGljIGlu dCBzaV9pbml0X3NtY190YWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpZiAoYWRl di0+cG0uZHBtLnBsYXRmb3JtX2NhcHMgJiBBVE9NX1BQX1BMQVRGT1JNX0NBUF9TVEVQVkREQykK IAkJdGFibGUtPnN5c3RlbUZsYWdzIHw9IFBQU01DX1NZU1RFTUZMQUdfU1RFUFZEREM7CiAKLQlp ZiAocGktPm1lbV9nZGRyNSkKKwlpZiAoYWRldi0+bWMudnJhbV90eXBlID09IEFNREdQVV9WUkFN X1RZUEVfR0REUjUpCiAJCXRhYmxlLT5zeXN0ZW1GbGFncyB8PSBQUFNNQ19TWVNURU1GTEFHX0dE RFI1OwogCiAJaWYgKGFkZXYtPnBtLmRwbS5wbGF0Zm9ybV9jYXBzICYgQVRPTV9QUF9QTEFURk9S TV9DQVBfUkVWRVJUX0dQSU81X1BPTEFSSVRZKQpAQCAtNTQxNCw3ICs1NDE0LDcgQEAgc3RhdGlj IGludCBzaV9wb3B1bGF0ZV9tY2xrX3ZhbHVlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CW1wbGxfYWRfZnVuY19jbnRsICY9IH5ZQ0xLX1BPU1RfRElWX01BU0s7CiAJbXBsbF9hZF9mdW5j X2NudGwgfD0gWUNMS19QT1NUX0RJVihtcGxsX3BhcmFtLnBvc3RfZGl2KTsKIAotCWlmIChwaS0+ bWVtX2dkZHI1KSB7CisJaWYgKGFkZXYtPm1jLnZyYW1fdHlwZSA9PSBBTURHUFVfVlJBTV9UWVBF X0dERFI1KSB7CiAJCW1wbGxfZHFfZnVuY19jbnRsICY9IH4oWUNMS19TRUxfTUFTSyB8IFlDTEtf UE9TVF9ESVZfTUFTSyk7CiAJCW1wbGxfZHFfZnVuY19jbnRsIHw9IFlDTEtfU0VMKG1wbGxfcGFy YW0ueWNsa19zZWwpIHwKIAkJCVlDTEtfUE9TVF9ESVYobXBsbF9wYXJhbS5wb3N0X2Rpdik7CkBA IC01NDI2LDcgKzU0MjYsNyBAQCBzdGF0aWMgaW50IHNpX3BvcHVsYXRlX21jbGtfdmFsdWUoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCXUzMiB0bXA7CiAJCXUzMiByZWZlcmVuY2VfY2xv Y2sgPSBhZGV2LT5jbG9jay5tcGxsLnJlZmVyZW5jZV9mcmVxOwogCi0JCWlmIChwaS0+bWVtX2dk ZHI1KQorCQlpZiAoYWRldi0+bWMudnJhbV90eXBlID09IEFNREdQVV9WUkFNX1RZUEVfR0REUjUp CiAJCQlmcmVxX25vbSA9IG1lbW9yeV9jbG9jayAqIDQ7CiAJCWVsc2UKIAkJCWZyZXFfbm9tID0g bWVtb3J5X2Nsb2NrICogMjsKQEAgLTU1MTgsNyArNTUxOCw3IEBAIHN0YXRpYyBpbnQgc2lfY29u dmVydF9wb3dlcl9sZXZlbF90b19zbWMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQls ZXZlbC0+bWNGbGFncyB8PSBTSVNMQU5EU19TTUNfTUNfUEdfRU47CiAJfQogCi0JaWYgKHBpLT5t ZW1fZ2RkcjUpIHsKKwlpZiAoYWRldi0+bWMudnJhbV90eXBlID09IEFNREdQVV9WUkFNX1RZUEVf R0REUjUpIHsKIAkJaWYgKHBsLT5tY2xrID4gcGktPm1jbGtfZWRjX2VuYWJsZV90aHJlc2hvbGQp CiAJCQlsZXZlbC0+bWNGbGFncyB8PSBTSVNMQU5EU19TTUNfTUNfRURDX1JEX0ZMQUc7CiAKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwph bWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK