From: Harry Wentland Subject: [PATCH 3/5] drm/amd/dal: refactor and fix lb memory size setting Date: Fri, 25 Nov 2016 16:59:39 -0500 Message-ID: <20161125215941.29972-4-harry.wentland@amd.com> References: <20161125215941.29972-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161125215941.29972-1-harry.wentland-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 Cc: Dmytro Laktyushkin RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KCi0g VW5kZXJsYXkgd2FzIG1pc3NpbmcgZGVmYXVsdCBsYiBtZW1vcnkgc2l6ZQotIFVuaWZ5IG51bV9v Zl9lbnRyaWVzIGFuZCBtZW1vcnkgc2l6ZQoKQ2hhbmdlLUlkOiBJNTIxZWM2NTMyZGJhNGRlNTU0 OTFjNGZiMTY0YTQ0YmY5MzI1MDY5OApTaWduZWQtb2ZmLWJ5OiBEbXl0cm8gTGFrdHl1c2hraW4g PERteXRyby5MYWt0eXVzaGtpbkBhbWQuY29tPgpSZXZpZXdlZC1ieTogUmV2aWV3ZWQtYnk6IEpv cmRhbiBMYXphcmUgPEpvcmRhbi5MYXphcmVAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRs YW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGFs L2RjL2RjZS9kY2VfdHJhbnNmb3JtLmMgICAgIHwgMjQgKysrKysrKysrKy0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlL2RjZV90cmFuc2Zvcm0uaCAgICAgfCAgNCAr KystCiAuLi4vZ3B1L2RybS9hbWQvZGFsL2RjL2RjZTEwMC9kY2UxMDBfcmVzb3VyY2UuYyAgICB8 ICAxIC0KIC4uLi9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlMTEwL2RjZTExMF90cmFuc2Zvcm1fdi5j IHwgIDYgKysrLS0tCiAuLi4vZ3B1L2RybS9hbWQvZGFsL2RjL2RjZTExMi9kY2UxMTJfcmVzb3Vy Y2UuYyAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2U4MC9kY2U4MF9y ZXNvdXJjZS5jICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2luYy9ody90cmFu c2Zvcm0uaCAgICAgIHwgIDQgLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCsp LCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9k Yy9kY2UvZGNlX3RyYW5zZm9ybS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlL2Rj ZV90cmFuc2Zvcm0uYwppbmRleCA0NjU5ZGVhZGNjMTUuLmY0N2I2NjE3ZjY2MiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlL2RjZV90cmFuc2Zvcm0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UvZGNlX3RyYW5zZm9ybS5jCkBAIC0yODUsNyAr Mjg1LDcgQEAgc3RhdGljIHZvaWQgZGNlX3RyYW5zZm9ybV9zZXRfc2NhbGVyKAogCS8qVXNlIGFs bCB0aHJlZSBwaWVjZXMgb2YgbWVtb3J5IGFsd2F5cyovCiAJUkVHX1NFVF8yKExCX01FTU9SWV9D VFJMLCAwLAogCQkJTEJfTUVNT1JZX0NPTkZJRywgMCwKLQkJCUxCX01FTU9SWV9TSVpFLCB4Zm1f ZGNlLT5iYXNlLmxiX21lbW9yeV9zaXplKTsKKwkJCUxCX01FTU9SWV9TSVpFLCB4Zm1fZGNlLT5s Yl9tZW1vcnlfc2l6ZSk7CiAKIAkvKiAxLiBQcm9ncmFtIG92ZXJzY2FuICovCiAJcHJvZ3JhbV9v dmVyc2Nhbih4Zm1fZGNlLCBkYXRhKTsKQEAgLTY0OSw3ICs2NDksNyBAQCBzdGF0aWMgdm9pZCBw cm9ncmFtX2JpdF9kZXB0aF9yZWR1Y3Rpb24oCiB9CiAKIHN0YXRpYyBpbnQgZGNlX3RyYW5zZm9y bV9nZXRfbWF4X251bV9vZl9zdXBwb3J0ZWRfbGluZXMoCi0Jc3RydWN0IHRyYW5zZm9ybSAqeGZt LAorCXN0cnVjdCBkY2VfdHJhbnNmb3JtICp4Zm1fZGNlLAogCWVudW0gbGJfcGl4ZWxfZGVwdGgg ZGVwdGgsCiAJaW50IHBpeGVsX3dpZHRoKQogewpAQCAtNjYzLDIzICs2NjMsMjMgQEAgc3RhdGlj IGludCBkY2VfdHJhbnNmb3JtX2dldF9tYXhfbnVtX29mX3N1cHBvcnRlZF9saW5lcygKIAkgKiBh Y3Jvc3MgbXVsdGlwbGUgZW50cmllcy4gKi8KIAlzd2l0Y2ggKGRlcHRoKSB7CiAJY2FzZSBMQl9Q SVhFTF9ERVBUSF8xOEJQUDoKLQkJcGl4ZWxzX3Blcl9lbnRyaWVzID0geGZtLT5sYl9iaXRzX3Bl cl9lbnRyeSAvIDE4OworCQlwaXhlbHNfcGVyX2VudHJpZXMgPSB4Zm1fZGNlLT5sYl9iaXRzX3Bl cl9lbnRyeSAvIDE4OwogCQlicmVhazsKIAogCWNhc2UgTEJfUElYRUxfREVQVEhfMjRCUFA6Ci0J CXBpeGVsc19wZXJfZW50cmllcyA9IHhmbS0+bGJfYml0c19wZXJfZW50cnkgLyAyNDsKKwkJcGl4 ZWxzX3Blcl9lbnRyaWVzID0geGZtX2RjZS0+bGJfYml0c19wZXJfZW50cnkgLyAyNDsKIAkJYnJl YWs7CiAKIAljYXNlIExCX1BJWEVMX0RFUFRIXzMwQlBQOgotCQlwaXhlbHNfcGVyX2VudHJpZXMg PSB4Zm0tPmxiX2JpdHNfcGVyX2VudHJ5IC8gMzA7CisJCXBpeGVsc19wZXJfZW50cmllcyA9IHhm bV9kY2UtPmxiX2JpdHNfcGVyX2VudHJ5IC8gMzA7CiAJCWJyZWFrOwogCiAJY2FzZSBMQl9QSVhF TF9ERVBUSF8zNkJQUDoKLQkJcGl4ZWxzX3Blcl9lbnRyaWVzID0geGZtLT5sYl9iaXRzX3Blcl9l bnRyeSAvIDM2OworCQlwaXhlbHNfcGVyX2VudHJpZXMgPSB4Zm1fZGNlLT5sYl9iaXRzX3Blcl9l bnRyeSAvIDM2OwogCQlicmVhazsKIAogCWRlZmF1bHQ6Ci0JCWRtX2xvZ2dlcl93cml0ZSh4Zm0t PmN0eC0+bG9nZ2VyLCBMT0dfV0FSTklORywKKwkJZG1fbG9nZ2VyX3dyaXRlKHhmbV9kY2UtPmJh c2UuY3R4LT5sb2dnZXIsIExPR19XQVJOSU5HLAogCQkJIiVzOiBJbnZhbGlkIExCIHBpeGVsIGRl cHRoIiwKIAkJCV9fZnVuY19fKTsKIAkJQlJFQUtfVE9fREVCVUdHRVIoKTsKQEAgLTY5MCw3ICs2 OTAsNyBAQCBzdGF0aWMgaW50IGRjZV90cmFuc2Zvcm1fZ2V0X21heF9udW1fb2Zfc3VwcG9ydGVk X2xpbmVzKAogCiAJbWF4X3BpeGVsc19zdXBwb3J0cyA9CiAJCQlwaXhlbHNfcGVyX2VudHJpZXMg KgotCQkJeGZtLT5sYl90b3RhbF9lbnRyaWVzX251bTsKKwkJCXhmbV9kY2UtPmxiX21lbW9yeV9z aXplOwogCiAJcmV0dXJuIChtYXhfcGl4ZWxzX3N1cHBvcnRzIC8gcGl4ZWxfd2lkdGgpOwogfQpA QCAtODk5LDcgKzg5OSw3IEBAIGJvb2wgZGNlX3RyYW5zZm9ybV9nZXRfb3B0aW1hbF9udW1iZXJf b2ZfdGFwcygKIAkJcGl4ZWxfd2lkdGggPSBzY2xfZGF0YS0+cmVjb3V0LndpZHRoOwogCiAJbWF4 X251bV9vZl9saW5lcyA9IGRjZV90cmFuc2Zvcm1fZ2V0X21heF9udW1fb2Zfc3VwcG9ydGVkX2xp bmVzKAotCQl4Zm0sCisJCXhmbV9kY2UsCiAJCXNjbF9kYXRhLT5sYl9wYXJhbXMuZGVwdGgsCiAJ CXBpeGVsX3dpZHRoKTsKIApAQCAtOTk1LDEwICs5OTUsOCBAQCBib29sIGRjZV90cmFuc2Zvcm1f Y29uc3RydWN0KAogCQkJTEJfUElYRUxfREVQVEhfMjRCUFAgfAogCQkJTEJfUElYRUxfREVQVEhf MzBCUFA7CiAKLQl4Zm1fZGNlLT5iYXNlLmxiX2JpdHNfcGVyX2VudHJ5ID0gTEJfQklUU19QRVJf RU5UUlk7Ci0JeGZtX2RjZS0+YmFzZS5sYl90b3RhbF9lbnRyaWVzX251bSA9IExCX1RPVEFMX05V TUJFUl9PRl9FTlRSSUVTOwotCi0JeGZtX2RjZS0+YmFzZS5sYl9tZW1vcnlfc2l6ZSA9IDB4NkIw OyAvKjE3MTIqLworCXhmbV9kY2UtPmxiX2JpdHNfcGVyX2VudHJ5ID0gTEJfQklUU19QRVJfRU5U Ulk7CisJeGZtX2RjZS0+bGJfbWVtb3J5X3NpemUgPSBMQl9UT1RBTF9OVU1CRVJfT0ZfRU5UUklF UzsgLyoweDZCMCovCiAKIAlyZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGFsL2RjL2RjZS9kY2VfdHJhbnNmb3JtLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2RhbC9kYy9kY2UvZGNlX3RyYW5zZm9ybS5oCmluZGV4IGI3OTNkZGRhNDc4My4uODk3NjQ1ZTI4 ODlmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UvZGNlX3RyYW5z Zm9ybS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2RjZS9kY2VfdHJhbnNmb3Jt LmgKQEAgLTI5MSw3ICsyOTEsOSBAQCBzdHJ1Y3QgZGNlX3RyYW5zZm9ybSB7CiAJY29uc3QgdWlu dDE2X3QgKmZpbHRlcl9oOwogCWNvbnN0IHVpbnQxNl90ICpmaWx0ZXJfdl9jOwogCWNvbnN0IHVp bnQxNl90ICpmaWx0ZXJfaF9jOwotCXVpbnQzMl90IGxiX3BpeGVsX2RlcHRoX3N1cHBvcnRlZDsK KwlpbnQgbGJfcGl4ZWxfZGVwdGhfc3VwcG9ydGVkOworCWludCBsYl9tZW1vcnlfc2l6ZTsKKwlp bnQgbGJfYml0c19wZXJfZW50cnk7CiAJYm9vbCBwcmVzY2FsZXJfb247CiB9OwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMKaW5k ZXggMDhlMGNhMTFhNDhkLi5mYWZjOTc2ZTUyMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGFsL2RjL2RjZTEwMC9kY2UxMDBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2RhbC9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMKQEAgLTU0MSw3ICs1NDEsNiBA QCBzdGF0aWMgc3RydWN0IHRyYW5zZm9ybSAqZGNlMTAwX3RyYW5zZm9ybV9jcmVhdGUoCiAKIAlp ZiAoZGNlX3RyYW5zZm9ybV9jb25zdHJ1Y3QodHJhbnNmb3JtLCBjdHgsIGluc3QsCiAJCQkmeGZt X3JlZ3NbaW5zdF0sICZ4Zm1fc2hpZnQsICZ4Zm1fbWFzaykpIHsKLQkJdHJhbnNmb3JtLT5iYXNl LmxiX21lbW9yeV9zaXplID0gMHg2QjA7IC8qMTcxMiovCiAJCXJldHVybiAmdHJhbnNmb3JtLT5i YXNlOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlMTEw L2RjZTExMF90cmFuc2Zvcm1fdi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlMTEw L2RjZTExMF90cmFuc2Zvcm1fdi5jCmluZGV4IDRmMmFhNzcyMjk2MS4uN2Q4Y2Y3YTU4ZjQ2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UxMTAvZGNlMTEwX3RyYW5z Zm9ybV92LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlMTEwL2RjZTExMF90 cmFuc2Zvcm1fdi5jCkBAIC01MDMsNyArNTAzLDcgQEAgc3RhdGljIGJvb2wgZGNlMTEwX3hmbXZf cG93ZXJfdXBfbGluZV9idWZmZXIoc3RydWN0IHRyYW5zZm9ybSAqeGZtKQogCS8qVXNlIGFsbCB0 aHJlZSBwaWVjZXMgb2YgbWVtb3J5IGFsd2F5cyovCiAJc2V0X3JlZ19maWVsZF92YWx1ZSh2YWx1 ZSwgMCwgTEJWX01FTU9SWV9DVFJMLCBMQl9NRU1PUllfQ09ORklHKTsKIAkvKmhhcmQgY29kZWQg bnVtYmVyIERDRTExIDE3MTIoMHg2QjApIFBhcnRpdGlvbnM6IDcyMC85NjAvMTcxMiovCi0Jc2V0 X3JlZ19maWVsZF92YWx1ZSh2YWx1ZSwgeGZtX2RjZS0+YmFzZS5sYl9tZW1vcnlfc2l6ZSwgTEJW X01FTU9SWV9DVFJMLAorCXNldF9yZWdfZmllbGRfdmFsdWUodmFsdWUsIHhmbV9kY2UtPmxiX21l bW9yeV9zaXplLCBMQlZfTUVNT1JZX0NUUkwsCiAJCQlMQl9NRU1PUllfU0laRSk7CiAKIAlkbV93 cml0ZV9yZWcoeGZtX2RjZS0+YmFzZS5jdHgsIG1tTEJWX01FTU9SWV9DVFJMLCB2YWx1ZSk7CkBA IC02OTcsOCArNjk3LDggQEAgYm9vbCBkY2UxMTBfdHJhbnNmb3JtX3ZfY29uc3RydWN0KAogCQkJ TEJfUElYRUxfREVQVEhfMzBCUFA7CiAKIAl4Zm1fZGNlLT5wcmVzY2FsZXJfb24gPSB0cnVlOwot CXhmbV9kY2UtPmJhc2UubGJfYml0c19wZXJfZW50cnkgPSBMQl9CSVRTX1BFUl9FTlRSWTsKLQl4 Zm1fZGNlLT5iYXNlLmxiX3RvdGFsX2VudHJpZXNfbnVtID0gTEJfVE9UQUxfTlVNQkVSX09GX0VO VFJJRVM7CisJeGZtX2RjZS0+bGJfYml0c19wZXJfZW50cnkgPSBMQl9CSVRTX1BFUl9FTlRSWTsK Kwl4Zm1fZGNlLT5sYl9tZW1vcnlfc2l6ZSA9IExCX1RPVEFMX05VTUJFUl9PRl9FTlRSSUVTOyAv KjB4NkIwKi8KIAogCXJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kYWwvZGMvZGNlMTEyL2RjZTExMl9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kYWwvZGMvZGNlMTEyL2RjZTExMl9yZXNvdXJjZS5jCmluZGV4IGE5OTkxYWEyODY2Ni4uYzBk N2VjYzg5Mzc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2UxMTIv ZGNlMTEyX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZGNlMTEy L2RjZTExMl9yZXNvdXJjZS5jCkBAIC01NTUsNyArNTU1LDcgQEAgc3RhdGljIHN0cnVjdCB0cmFu c2Zvcm0gKmRjZTExMl90cmFuc2Zvcm1fY3JlYXRlKAogCiAJaWYgKGRjZV90cmFuc2Zvcm1fY29u c3RydWN0KHRyYW5zZm9ybSwgY3R4LCBpbnN0LAogCQkJJnhmbV9yZWdzW2luc3RdLCAmeGZtX3No aWZ0LCAmeGZtX21hc2spKSB7Ci0JCXRyYW5zZm9ybS0+YmFzZS5sYl9tZW1vcnlfc2l6ZSA9IDB4 MTQwNDsgLyo1MTI0Ki8KKwkJdHJhbnNmb3JtLT5sYl9tZW1vcnlfc2l6ZSA9IDB4MTQwNDsgLyo1 MTI0Ki8KIAkJcmV0dXJuICZ0cmFuc2Zvcm0tPmJhc2U7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY2U4MC9kY2U4MF9yZXNvdXJjZS5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kYWwvZGMvZGNlODAvZGNlODBfcmVzb3VyY2UuYwppbmRleCA3MzgyMDFiMTU3 MjIuLjdkYzBlOWY2MTY1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMv ZGNlODAvZGNlODBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9k Y2U4MC9kY2U4MF9yZXNvdXJjZS5jCkBAIC01MjQsNyArNTI0LDYgQEAgc3RhdGljIHN0cnVjdCB0 cmFuc2Zvcm0gKmRjZTgwX3RyYW5zZm9ybV9jcmVhdGUoCiAJaWYgKGRjZV90cmFuc2Zvcm1fY29u c3RydWN0KHRyYW5zZm9ybSwgY3R4LCBpbnN0LAogCQkJJnhmbV9yZWdzW2luc3RdLCAmeGZtX3No aWZ0LCAmeGZtX21hc2spKSB7CiAJCXRyYW5zZm9ybS0+cHJlc2NhbGVyX29uID0gZmFsc2U7Ci0J CXRyYW5zZm9ybS0+YmFzZS5sYl9tZW1vcnlfc2l6ZSA9IDB4NkIwOyAvKjE3MTIqLwogCQlyZXR1 cm4gJnRyYW5zZm9ybS0+YmFzZTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGFsL2RjL2luYy9ody90cmFuc2Zvcm0uaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2Rj L2luYy9ody90cmFuc2Zvcm0uaAppbmRleCA3Zjg4MjcyZjgyOTAuLmVmNzQzYjcwYjNlOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvaW5jL2h3L3RyYW5zZm9ybS5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2luYy9ody90cmFuc2Zvcm0uaApAQCAtMzcs MTAgKzM3LDYgQEAgc3RydWN0IHRyYW5zZm9ybSB7CiAJY29uc3Qgc3RydWN0IHRyYW5zZm9ybV9m dW5jcyAqZnVuY3M7CiAJc3RydWN0IGRjX2NvbnRleHQgKmN0eDsKIAlpbnQgaW5zdDsKLQotCWlu dCBsYl90b3RhbF9lbnRyaWVzX251bTsKLQlpbnQgbGJfYml0c19wZXJfZW50cnk7Ci0JdW5zaWdu ZWQgaW50IGxiX21lbW9yeV9zaXplOwogfTsKIAogLyogQ29sb3JpbWV0cnkgKi8KLS0gCjIuMTAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==