From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 1/3] drm/amdgpu: cleanup initializing gtt_size Date: Mon, 26 Jun 2017 15:39:55 +0200 Message-ID: <1498484397-1308-1-git-send-email-deathsimple@vodafone.de> 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: john-xq/Ko7C6e2Bl57MIdRCFDg@public.gmane.org, felix.kuehling-5C7GfCeVMHo@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKU3RvcCBz cHJlYWRpbmcgdGhlIGNvZGUgb3ZlciBhbGwgR01DIGdlbmVyYXRpb25zLgoKU2lnbmVkLW9mZi1i eTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZ2FydC5jIHwgMjAgKysrKysrKysrKysrKysrKysrKysKIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMgICAgfCAxMCArLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jICAgIHwgMTAgKy0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYyAgICB8IDEwICstLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMgICAgfCAxMCArLS0tLS0tLS0t CiA2IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggNzYyNDI5NC4uYWIxZGFkMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTU2MSw2ICs1NjEsNyBAQCBzdHJ1Y3QgYW1k Z3B1X2dhcnQgewogCWNvbnN0IHN0cnVjdCBhbWRncHVfZ2FydF9mdW5jcyAqZ2FydF9mdW5jczsK IH07CiAKK3ZvaWQgYW1kZ3B1X2dhcnRfc2V0X2RlZmF1bHRzKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KTsKIGludCBhbWRncHVfZ2FydF90YWJsZV9yYW1fYWxsb2Moc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpOwogdm9pZCBhbWRncHVfZ2FydF90YWJsZV9yYW1fZnJlZShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldik7CiBpbnQgYW1kZ3B1X2dhcnRfdGFibGVfdnJhbV9hbGxvYyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZ2FydC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2dhcnQuYwppbmRleCBjY2VmM2NmLi44ODc3MDE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZ2FydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9nYXJ0LmMKQEAgLTUyLDYgKzUyLDI2IEBACiAvKgogICogQ29tbW9uIEdBUlQg dGFibGUgZnVuY3Rpb25zLgogICovCisKKy8qKgorICogYW1kZ3B1X2dhcnRfc2V0X2RlZmF1bHRz IC0gc2V0IHRoZSBkZWZhdWx0IGd0dF9zaXplCisgKgorICogQGFkZXY6IGFtZGdwdV9kZXZpY2Ug cG9pbnRlcgorICoKKyAqIFNldCB0aGUgZGVmYXVsdCBndHRfc2l6ZSBiYXNlZCBvbiBwYXJhbWV0 ZXJzIGFuZCBhdmFpbGFibGUgVlJBTS4KKyAqLwordm9pZCBhbWRncHVfZ2FydF9zZXRfZGVmYXVs dHMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCit7CisJLyogdW5sZXNzIHRoZSB1c2VyIGhh ZCBvdmVycmlkZGVuIGl0LCBzZXQgdGhlIGdhcnQKKwkgKiBzaXplIGVxdWFsIHRvIHRoZSAxMDI0 IG9yIHZyYW0sIHdoaWNoZXZlciBpcyBsYXJnZXIuCisJICovCisJaWYgKGFtZGdwdV9nYXJ0X3Np emUgPT0gLTEpCisJCWFkZXYtPm1jLmd0dF9zaXplID0gbWF4KChBTURHUFVfREVGQVVMVF9HVFRf U0laRV9NQiA8PCAyMCksCisJCQkJCWFkZXYtPm1jLm1jX3ZyYW1fc2l6ZSk7CisJZWxzZQorCQlh ZGV2LT5tYy5ndHRfc2l6ZSA9ICh1aW50NjRfdClhbWRncHVfZ2FydF9zaXplIDw8IDIwOworfQor CiAvKioKICAqIGFtZGdwdV9nYXJ0X3RhYmxlX3JhbV9hbGxvYyAtIGFsbG9jYXRlIHN5c3RlbSBy YW0gZm9yIGdhcnQgcGFnZSB0YWJsZQogICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192Nl8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZf MC5jCmluZGV4IDM1NjU1YTEuLjVjYzNmMzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y2XzAuYwpAQCAtMzIxLDE1ICszMjEsNyBAQCBzdGF0aWMgaW50IGdtY192Nl8wX21jX2luaXQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJYWRldi0+bWMucmVhbF92cmFtX3NpemUgPSBS UkVHMzIobW1DT05GSUdfTUVNU0laRSkgKiAxMDI0VUxMICogMTAyNFVMTDsKIAlhZGV2LT5tYy52 aXNpYmxlX3ZyYW1fc2l6ZSA9IGFkZXYtPm1jLmFwZXJfc2l6ZTsKIAotCS8qIHVubGVzcyB0aGUg dXNlciBoYWQgb3ZlcnJpZGRlbiBpdCwgc2V0IHRoZSBnYXJ0Ci0JICogc2l6ZSBlcXVhbCB0byB0 aGUgMTAyNCBvciB2cmFtLCB3aGljaGV2ZXIgaXMgbGFyZ2VyLgotCSAqLwotCWlmIChhbWRncHVf Z2FydF9zaXplID09IC0xKQotCQlhZGV2LT5tYy5ndHRfc2l6ZSA9IG1heCgoQU1ER1BVX0RFRkFV TFRfR1RUX1NJWkVfTUIgPDwgMjApLAotCQkJCQlhZGV2LT5tYy5tY192cmFtX3NpemUpOwotCWVs c2UKLQkJYWRldi0+bWMuZ3R0X3NpemUgPSAodWludDY0X3QpYW1kZ3B1X2dhcnRfc2l6ZSA8PCAy MDsKLQorCWFtZGdwdV9nYXJ0X3NldF9kZWZhdWx0cyhhZGV2KTsKIAlnbWNfdjZfMF92cmFtX2d0 dF9sb2NhdGlvbihhZGV2LCAmYWRldi0+bWMpOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ21jX3Y3XzAuYwppbmRleCA4M2MyMWExLi4xNWYyYzBmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dtY192N18wLmMKQEAgLTM3MywxNSArMzczLDcgQEAgc3RhdGljIGludCBn bWNfdjdfMF9tY19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlmIChhZGV2LT5t Yy52aXNpYmxlX3ZyYW1fc2l6ZSA+IGFkZXYtPm1jLnJlYWxfdnJhbV9zaXplKQogCQlhZGV2LT5t Yy52aXNpYmxlX3ZyYW1fc2l6ZSA9IGFkZXYtPm1jLnJlYWxfdnJhbV9zaXplOwogCi0JLyogdW5s ZXNzIHRoZSB1c2VyIGhhZCBvdmVycmlkZGVuIGl0LCBzZXQgdGhlIGdhcnQKLQkgKiBzaXplIGVx dWFsIHRvIHRoZSAxMDI0IG9yIHZyYW0sIHdoaWNoZXZlciBpcyBsYXJnZXIuCi0JICovCi0JaWYg KGFtZGdwdV9nYXJ0X3NpemUgPT0gLTEpCi0JCWFkZXYtPm1jLmd0dF9zaXplID0gbWF4KChBTURH UFVfREVGQVVMVF9HVFRfU0laRV9NQiA8PCAyMCksCi0JCQkJCWFkZXYtPm1jLm1jX3ZyYW1fc2l6 ZSk7Ci0JZWxzZQotCQlhZGV2LT5tYy5ndHRfc2l6ZSA9ICh1aW50NjRfdClhbWRncHVfZ2FydF9z aXplIDw8IDIwOwotCisJYW1kZ3B1X2dhcnRfc2V0X2RlZmF1bHRzKGFkZXYpOwogCWdtY192N18w X3ZyYW1fZ3R0X2xvY2F0aW9uKGFkZXYsICZhZGV2LT5tYyk7CiAKIAlyZXR1cm4gMDsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jCmluZGV4IGM5MmFmMjQuLjIxM2FmNjUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYwpAQCAtNTM1LDE1ICs1MzUsNyBAQCBzdGF0 aWMgaW50IGdtY192OF8wX21jX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaWYg KGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplID4gYWRldi0+bWMucmVhbF92cmFtX3NpemUpCiAJ CWFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplID0gYWRldi0+bWMucmVhbF92cmFtX3NpemU7CiAK LQkvKiB1bmxlc3MgdGhlIHVzZXIgaGFkIG92ZXJyaWRkZW4gaXQsIHNldCB0aGUgZ2FydAotCSAq IHNpemUgZXF1YWwgdG8gdGhlIDEwMjQgb3IgdnJhbSwgd2hpY2hldmVyIGlzIGxhcmdlci4KLQkg Ki8KLQlpZiAoYW1kZ3B1X2dhcnRfc2l6ZSA9PSAtMSkKLQkJYWRldi0+bWMuZ3R0X3NpemUgPSBt YXgoKEFNREdQVV9ERUZBVUxUX0dUVF9TSVpFX01CIDw8IDIwKSwKLQkJCQkJYWRldi0+bWMubWNf dnJhbV9zaXplKTsKLQllbHNlCi0JCWFkZXYtPm1jLmd0dF9zaXplID0gKHVpbnQ2NF90KWFtZGdw dV9nYXJ0X3NpemUgPDwgMjA7Ci0KKwlhbWRncHVfZ2FydF9zZXRfZGVmYXVsdHMoYWRldik7CiAJ Z21jX3Y4XzBfdnJhbV9ndHRfbG9jYXRpb24oYWRldiwgJmFkZXYtPm1jKTsKIAogCXJldHVybiAw OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKaW5kZXggN2M2MTg4Yi4uMTI4OTg5 ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jCkBAIC00OTUsMTUgKzQ5NSw3 IEBAIHN0YXRpYyBpbnQgZ21jX3Y5XzBfbWNfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIAlpZiAoYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPiBhZGV2LT5tYy5yZWFsX3ZyYW1f c2l6ZSkKIAkJYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPSBhZGV2LT5tYy5yZWFsX3ZyYW1f c2l6ZTsKIAotCS8qIHVubGVzcyB0aGUgdXNlciBoYWQgb3ZlcnJpZGRlbiBpdCwgc2V0IHRoZSBn YXJ0Ci0JICogc2l6ZSBlcXVhbCB0byB0aGUgMTAyNCBvciB2cmFtLCB3aGljaGV2ZXIgaXMgbGFy Z2VyLgotCSAqLwotCWlmIChhbWRncHVfZ2FydF9zaXplID09IC0xKQotCQlhZGV2LT5tYy5ndHRf c2l6ZSA9IG1heCgoQU1ER1BVX0RFRkFVTFRfR1RUX1NJWkVfTUIgPDwgMjApLAotCQkJCQlhZGV2 LT5tYy5tY192cmFtX3NpemUpOwotCWVsc2UKLQkJYWRldi0+bWMuZ3R0X3NpemUgPSAodWludDY0 X3QpYW1kZ3B1X2dhcnRfc2l6ZSA8PCAyMDsKLQorCWFtZGdwdV9nYXJ0X3NldF9kZWZhdWx0cyhh ZGV2KTsKIAlnbWNfdjlfMF92cmFtX2d0dF9sb2NhdGlvbihhZGV2LCAmYWRldi0+bWMpOwogCiAJ cmV0dXJuIDA7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4Cg==