From: Harry Wentland Subject: [PATCH] drm/amdgpu: Read vram width from integrated system info table Date: Fri, 31 Mar 2017 20:19:58 -0400 Message-ID: <20170401001958.22137-1-harry.wentland@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: Harry Wentland T24gS0IsIEtWLCBDWiB3ZSBzaG91bGQgcmVhZCB0aGUgdnJhbSB3aWR0aCBmcm9tIGludGVncmF0 ZWQgc3lzdGVtCnRhYmxlLCBpZiB3ZSBjYW4uIFRoZSBOT09GQ0hBTiBpbiBNQ19TSEFSRURfQ0hN QVAgaXMgbm90IGFjY3VyYXRlLgoKV2l0aCB0aGlzIGNoYW5nZSB3ZSBjYW4gZW5hYmxlIHR3byA0 ayBkaXNwbGF5cyBvbiBDWiBhZ2Fpbi4gVGhpcyB1c2UKY2FzZSB3YXMgYnJva2VuIHNvbWV0aW1l IGluIEphbnVhcnkgd2hlbiB3ZSBzdGFydGVkIGxvb2tpbmcgYXQKdnJhbV93aWR0aCBmb3IgYmFu ZHdpZHRoIGNhbGN1bGF0aW9ucyBpbnN0ZWFkIG9mIGhhcmRjb2RpbmcgdGhpcyB2YWx1ZS4KClRl c3RlZC1ieTogUm9tYW4gTGkgPHJvbWFuLmxpQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEhhcnJ5 IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5jIHwgMjcgKysrKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuaCB8ICAyICsKIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192N18wLmMgICAgICAgIHwgODcgKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYyAgICAgICAgfCA4NyAr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEyMSBpbnNlcnRp b25zKCspLCA4MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9hdG9tYmlvcy5jCmluZGV4IGY1MmIxYmYzZDNkOS4uZjI2NzA3NzY1YjhkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuYwpAQCAtNzU0LDYgKzc1 NCwzMyBAQCB1bmlvbiBpZ3BfaW5mbyB7CiAJc3RydWN0IF9BVE9NX0lOVEVHUkFURURfU1lTVEVN X0lORk9fVjFfOSBpbmZvXzk7CiB9OwogCisvKgorICogUmV0dXJuIHZyYW0gd2lkdGggZnJvbSBp bnRlZ3JhdGVkIHN5c3RlbSBpbmZvIHRhYmxlLCBpZiBhdmFpbGFibGUsCisgKiBvciAwIGlmIG5v dC4KKyAqLworaW50IGFtZGdwdV9hdG9tYmlvc19nZXRfdnJhbV93aWR0aChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKK3sKKwlzdHJ1Y3QgYW1kZ3B1X21vZGVfaW5mbyAqbW9kZV9pbmZvID0g JmFkZXYtPm1vZGVfaW5mbzsKKwlpbnQgaW5kZXggPSBHZXRJbmRleEludG9NYXN0ZXJUYWJsZShE QVRBLCBJbnRlZ3JhdGVkU3lzdGVtSW5mbyk7CisJdTE2IGRhdGFfb2Zmc2V0LCBzaXplOworCXVu aW9uIGlncF9pbmZvICppZ3BfaW5mbzsKKwl1OCBmcmV2LCBjcmV2OworCisJLyogZ2V0IGFueSBp Z3Agc3BlY2lmaWMgb3ZlcnJpZGVzICovCisJaWYgKGFtZGdwdV9hdG9tX3BhcnNlX2RhdGFfaGVh ZGVyKG1vZGVfaW5mby0+YXRvbV9jb250ZXh0LCBpbmRleCwgJnNpemUsCisJCQkJICAgJmZyZXYs ICZjcmV2LCAmZGF0YV9vZmZzZXQpKSB7CisJCWlncF9pbmZvID0gKHVuaW9uIGlncF9pbmZvICop CisJCQkobW9kZV9pbmZvLT5hdG9tX2NvbnRleHQtPmJpb3MgKyBkYXRhX29mZnNldCk7CisJCXN3 aXRjaCAoY3JldikgeworCQljYXNlIDg6CisJCWNhc2UgOToKKwkJCXJldHVybiBpZ3BfaW5mby0+ aW5mb184LnVjVU1BQ2hhbm5lbE51bWJlciAqIDY0OworCQlkZWZhdWx0OgorCQkJcmV0dXJuIDA7 CisJCX0KKwl9Cit9CisKIHN0YXRpYyB2b2lkIGFtZGdwdV9hdG9tYmlvc19nZXRfaWdwX3NzX292 ZXJyaWRlcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkJCSBzdHJ1Y3QgYW1kZ3B1 X2F0b21fc3MgKnNzLAogCQkJCQkJIGludCBpZCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2F0b21iaW9zLmgKaW5kZXggNGUwZjQ4ODQ4N2YzLi4zOGQwZmUzMmU1Y2QgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5oCkBAIC0xNDgs NiArMTQ4LDggQEAgaW50IGFtZGdwdV9hdG9tYmlvc19nZXRfY2xvY2tfaW5mbyhzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldik7CiAKIGludCBhbWRncHVfYXRvbWJpb3NfZ2V0X2dmeF9pbmZvKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIAoraW50IGFtZGdwdV9hdG9tYmlvc19nZXRfdnJh bV93aWR0aChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CisKIGJvb2wgYW1kZ3B1X2F0b21i aW9zX2dldF9hc2ljX3NzX2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJICAg ICAgc3RydWN0IGFtZGdwdV9hdG9tX3NzICpzcywKIAkJCQkgICAgICBpbnQgaWQsIHUzMiBjbG9j ayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYwppbmRleCAwYzBhNjAxNWNjYTUu Ljc4NjQzYTFiYWE1YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y3XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jCkBAIC0z Nyw2ICszNyw4IEBACiAjaW5jbHVkZSAib3NzL29zc18yXzBfZC5oIgogI2luY2x1ZGUgIm9zcy9v c3NfMl8wX3NoX21hc2suaCIKIAorI2luY2x1ZGUgImFtZGdwdV9hdG9tYmlvcy5oIgorCiBzdGF0 aWMgdm9pZCBnbWNfdjdfMF9zZXRfZ2FydF9mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dik7CiBzdGF0aWMgdm9pZCBnbWNfdjdfMF9zZXRfaXJxX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKIHN0YXRpYyBpbnQgZ21jX3Y3XzBfd2FpdF9mb3JfaWRsZSh2b2lkICpoYW5k bGUpOwpAQCAtMzI1LDQ4ICszMjcsNTEgQEAgc3RhdGljIHZvaWQgZ21jX3Y3XzBfbWNfcHJvZ3Jh bShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKICAqLwogc3RhdGljIGludCBnbWNfdjdfMF9t Y19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCXUzMiB0bXA7Ci0JaW50IGNo YW5zaXplLCBudW1jaGFuOwotCi0JLyogR2V0IFZSQU0gaW5mb3JtYXRpb25zICovCi0JdG1wID0g UlJFRzMyKG1tTUNfQVJCX1JBTUNGRyk7Ci0JaWYgKFJFR19HRVRfRklFTEQodG1wLCBNQ19BUkJf UkFNQ0ZHLCBDSEFOU0laRSkpIHsKLQkJY2hhbnNpemUgPSA2NDsKLQl9IGVsc2UgewotCQljaGFu c2l6ZSA9IDMyOwotCX0KLQl0bXAgPSBSUkVHMzIobW1NQ19TSEFSRURfQ0hNQVApOwotCXN3aXRj aCAoUkVHX0dFVF9GSUVMRCh0bXAsIE1DX1NIQVJFRF9DSE1BUCwgTk9PRkNIQU4pKSB7Ci0JY2Fz ZSAwOgotCWRlZmF1bHQ6Ci0JCW51bWNoYW4gPSAxOwotCQlicmVhazsKLQljYXNlIDE6Ci0JCW51 bWNoYW4gPSAyOwotCQlicmVhazsKLQljYXNlIDI6Ci0JCW51bWNoYW4gPSA0OwotCQlicmVhazsK LQljYXNlIDM6Ci0JCW51bWNoYW4gPSA4OwotCQlicmVhazsKLQljYXNlIDQ6Ci0JCW51bWNoYW4g PSAzOwotCQlicmVhazsKLQljYXNlIDU6Ci0JCW51bWNoYW4gPSA2OwotCQlicmVhazsKLQljYXNl IDY6Ci0JCW51bWNoYW4gPSAxMDsKLQkJYnJlYWs7Ci0JY2FzZSA3OgotCQludW1jaGFuID0gMTI7 Ci0JCWJyZWFrOwotCWNhc2UgODoKLQkJbnVtY2hhbiA9IDE2OwotCQlicmVhazsKKwlhZGV2LT5t Yy52cmFtX3dpZHRoID0gYW1kZ3B1X2F0b21iaW9zX2dldF92cmFtX3dpZHRoKGFkZXYpOworCWlm ICghYWRldi0+bWMudnJhbV93aWR0aCkgeworCQl1MzIgdG1wOworCQlpbnQgY2hhbnNpemUsIG51 bWNoYW47CisKKwkJLyogR2V0IFZSQU0gaW5mb3JtYXRpb25zICovCisJCXRtcCA9IFJSRUczMiht bU1DX0FSQl9SQU1DRkcpOworCQlpZiAoUkVHX0dFVF9GSUVMRCh0bXAsIE1DX0FSQl9SQU1DRkcs IENIQU5TSVpFKSkgeworCQkJY2hhbnNpemUgPSA2NDsKKwkJfSBlbHNlIHsKKwkJCWNoYW5zaXpl ID0gMzI7CisJCX0KKwkJdG1wID0gUlJFRzMyKG1tTUNfU0hBUkVEX0NITUFQKTsKKwkJc3dpdGNo IChSRUdfR0VUX0ZJRUxEKHRtcCwgTUNfU0hBUkVEX0NITUFQLCBOT09GQ0hBTikpIHsKKwkJY2Fz ZSAwOgorCQlkZWZhdWx0OgorCQkJbnVtY2hhbiA9IDE7CisJCQlicmVhazsKKwkJY2FzZSAxOgor CQkJbnVtY2hhbiA9IDI7CisJCQlicmVhazsKKwkJY2FzZSAyOgorCQkJbnVtY2hhbiA9IDQ7CisJ CQlicmVhazsKKwkJY2FzZSAzOgorCQkJbnVtY2hhbiA9IDg7CisJCQlicmVhazsKKwkJY2FzZSA0 OgorCQkJbnVtY2hhbiA9IDM7CisJCQlicmVhazsKKwkJY2FzZSA1OgorCQkJbnVtY2hhbiA9IDY7 CisJCQlicmVhazsKKwkJY2FzZSA2OgorCQkJbnVtY2hhbiA9IDEwOworCQkJYnJlYWs7CisJCWNh c2UgNzoKKwkJCW51bWNoYW4gPSAxMjsKKwkJCWJyZWFrOworCQljYXNlIDg6CisJCQludW1jaGFu ID0gMTY7CisJCQlicmVhazsKKwkJfQorCQlhZGV2LT5tYy52cmFtX3dpZHRoID0gbnVtY2hhbiAq IGNoYW5zaXplOwogCX0KLQlhZGV2LT5tYy52cmFtX3dpZHRoID0gbnVtY2hhbiAqIGNoYW5zaXpl OwogCS8qIENvdWxkIGFwZXIgc2l6ZSByZXBvcnQgMCA/ICovCiAJYWRldi0+bWMuYXBlcl9iYXNl ID0gcGNpX3Jlc291cmNlX3N0YXJ0KGFkZXYtPnBkZXYsIDApOwogCWFkZXYtPm1jLmFwZXJfc2l6 ZSA9IHBjaV9yZXNvdXJjZV9sZW4oYWRldi0+cGRldiwgMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ21jX3Y4XzAuYwppbmRleCBkMTlkMWM1ZTI4NDcuLjQyYjJmMzU3YTc5OSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jCkBAIC0zOCw2ICszOCw4IEBACiAjaW5jbHVkZSAi dmlkLmgiCiAjaW5jbHVkZSAidmkuaCIKIAorI2luY2x1ZGUgImFtZGdwdV9hdG9tYmlvcy5oIgor CiAKIHN0YXRpYyB2b2lkIGdtY192OF8wX3NldF9nYXJ0X2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIGdtY192OF8wX3NldF9pcnFfZnVuY3Moc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpOwpAQCAtNDg3LDQ4ICs0ODksNTEgQEAgc3RhdGljIHZvaWQgZ21j X3Y4XzBfbWNfcHJvZ3JhbShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKICAqLwogc3RhdGlj IGludCBnbWNfdjhfMF9tY19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCXUz MiB0bXA7Ci0JaW50IGNoYW5zaXplLCBudW1jaGFuOwotCi0JLyogR2V0IFZSQU0gaW5mb3JtYXRp b25zICovCi0JdG1wID0gUlJFRzMyKG1tTUNfQVJCX1JBTUNGRyk7Ci0JaWYgKFJFR19HRVRfRklF TEQodG1wLCBNQ19BUkJfUkFNQ0ZHLCBDSEFOU0laRSkpIHsKLQkJY2hhbnNpemUgPSA2NDsKLQl9 IGVsc2UgewotCQljaGFuc2l6ZSA9IDMyOwotCX0KLQl0bXAgPSBSUkVHMzIobW1NQ19TSEFSRURf Q0hNQVApOwotCXN3aXRjaCAoUkVHX0dFVF9GSUVMRCh0bXAsIE1DX1NIQVJFRF9DSE1BUCwgTk9P RkNIQU4pKSB7Ci0JY2FzZSAwOgotCWRlZmF1bHQ6Ci0JCW51bWNoYW4gPSAxOwotCQlicmVhazsK LQljYXNlIDE6Ci0JCW51bWNoYW4gPSAyOwotCQlicmVhazsKLQljYXNlIDI6Ci0JCW51bWNoYW4g PSA0OwotCQlicmVhazsKLQljYXNlIDM6Ci0JCW51bWNoYW4gPSA4OwotCQlicmVhazsKLQljYXNl IDQ6Ci0JCW51bWNoYW4gPSAzOwotCQlicmVhazsKLQljYXNlIDU6Ci0JCW51bWNoYW4gPSA2Owot CQlicmVhazsKLQljYXNlIDY6Ci0JCW51bWNoYW4gPSAxMDsKLQkJYnJlYWs7Ci0JY2FzZSA3Ogot CQludW1jaGFuID0gMTI7Ci0JCWJyZWFrOwotCWNhc2UgODoKLQkJbnVtY2hhbiA9IDE2OwotCQli cmVhazsKKwlhZGV2LT5tYy52cmFtX3dpZHRoID0gYW1kZ3B1X2F0b21iaW9zX2dldF92cmFtX3dp ZHRoKGFkZXYpOworCWlmICghYWRldi0+bWMudnJhbV93aWR0aCkgeworCQl1MzIgdG1wOworCQlp bnQgY2hhbnNpemUsIG51bWNoYW47CisKKwkJLyogR2V0IFZSQU0gaW5mb3JtYXRpb25zICovCisJ CXRtcCA9IFJSRUczMihtbU1DX0FSQl9SQU1DRkcpOworCQlpZiAoUkVHX0dFVF9GSUVMRCh0bXAs IE1DX0FSQl9SQU1DRkcsIENIQU5TSVpFKSkgeworCQkJY2hhbnNpemUgPSA2NDsKKwkJfSBlbHNl IHsKKwkJCWNoYW5zaXplID0gMzI7CisJCX0KKwkJdG1wID0gUlJFRzMyKG1tTUNfU0hBUkVEX0NI TUFQKTsKKwkJc3dpdGNoIChSRUdfR0VUX0ZJRUxEKHRtcCwgTUNfU0hBUkVEX0NITUFQLCBOT09G Q0hBTikpIHsKKwkJY2FzZSAwOgorCQlkZWZhdWx0OgorCQkJbnVtY2hhbiA9IDE7CisJCQlicmVh azsKKwkJY2FzZSAxOgorCQkJbnVtY2hhbiA9IDI7CisJCQlicmVhazsKKwkJY2FzZSAyOgorCQkJ bnVtY2hhbiA9IDQ7CisJCQlicmVhazsKKwkJY2FzZSAzOgorCQkJbnVtY2hhbiA9IDg7CisJCQli cmVhazsKKwkJY2FzZSA0OgorCQkJbnVtY2hhbiA9IDM7CisJCQlicmVhazsKKwkJY2FzZSA1Ogor CQkJbnVtY2hhbiA9IDY7CisJCQlicmVhazsKKwkJY2FzZSA2OgorCQkJbnVtY2hhbiA9IDEwOwor CQkJYnJlYWs7CisJCWNhc2UgNzoKKwkJCW51bWNoYW4gPSAxMjsKKwkJCWJyZWFrOworCQljYXNl IDg6CisJCQludW1jaGFuID0gMTY7CisJCQlicmVhazsKKwkJfQorCQlhZGV2LT5tYy52cmFtX3dp ZHRoID0gbnVtY2hhbiAqIGNoYW5zaXplOwogCX0KLQlhZGV2LT5tYy52cmFtX3dpZHRoID0gbnVt Y2hhbiAqIGNoYW5zaXplOwogCS8qIENvdWxkIGFwZXIgc2l6ZSByZXBvcnQgMCA/ICovCiAJYWRl di0+bWMuYXBlcl9iYXNlID0gcGNpX3Jlc291cmNlX3N0YXJ0KGFkZXYtPnBkZXYsIDApOwogCWFk ZXYtPm1jLmFwZXJfc2l6ZSA9IHBjaV9yZXNvdXJjZV9sZW4oYWRldi0+cGRldiwgMCk7Ci0tIAoy LjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=