From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH] drm/amdgpu: clean up memory/GDS/GWS/OA alignment code Date: Tue, 22 Jan 2019 16:45:32 -0500 Message-ID: <20190122214532.1822-1-maraeo@gmail.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 RnJvbTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KCi0gbW92ZSBhbGwgYWRq dXN0bWVudHMgaW50byBvbmUgcGxhY2UKLSBzcGVjaWZ5IEdEUy9HV1MvT0EgYWxpZ25tZW50IGlu IGJhc2ljIHVuaXRzIG9mIHRoZSBoZWFwcwotIGl0IGxvb2tzIGxpa2UgR0RTIGFsaWdubWVudCB3 YXMgMSBpbnN0ZWFkIG9mIDQKClNpZ25lZC1vZmYtYnk6IE1hcmVrIE9sxaHDoWsgPG1hcmVrLm9s c2FrQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5j ICAgIHwgIDcgLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVj dC5jIHwgMTYgKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3R0bS5jICAgIHwgIDYgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMo KyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0u YwppbmRleCBmNGYwMDIxNzU0NmUuLmQyMWRkMmYzNjlkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9nZW0uYwpAQCAtNDcsMjQgKzQ3LDIwIEBAIGludCBhbWRncHVfZ2VtX29i amVjdF9jcmVhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVuc2lnbmVkIGxvbmcgc2l6 ZSwKIAkJCSAgICAgdTY0IGZsYWdzLCBlbnVtIHR0bV9ib190eXBlIHR5cGUsCiAJCQkgICAgIHN0 cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgKnJlc3YsCiAJCQkgICAgIHN0cnVjdCBkcm1fZ2VtX29i amVjdCAqKm9iaikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKIAlzdHJ1Y3QgYW1kZ3B1X2Jv X3BhcmFtIGJwOwogCWludCByOwogCiAJbWVtc2V0KCZicCwgMCwgc2l6ZW9mKGJwKSk7CiAJKm9i aiA9IE5VTEw7Ci0JLyogQXQgbGVhc3QgYWxpZ24gb24gcGFnZSBzaXplICovCi0JaWYgKGFsaWdu bWVudCA8IFBBR0VfU0laRSkgewotCQlhbGlnbm1lbnQgPSBQQUdFX1NJWkU7Ci0JfQogCiAJYnAu c2l6ZSA9IHNpemU7CiAJYnAuYnl0ZV9hbGlnbiA9IGFsaWdubWVudDsKIAlicC50eXBlID0gdHlw ZTsKIAlicC5yZXN2ID0gcmVzdjsKIAlicC5wcmVmZXJyZWRfZG9tYWluID0gaW5pdGlhbF9kb21h aW47CiByZXRyeToKIAlicC5mbGFncyA9IGZsYWdzOwogCWJwLmRvbWFpbiA9IGluaXRpYWxfZG9t YWluOwogCXIgPSBhbWRncHVfYm9fY3JlYXRlKGFkZXYsICZicCwgJmJvKTsKQEAgLTIzNywyMyAr MjMzLDIwIEBAIGludCBhbWRncHVfZ2VtX2NyZWF0ZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAogCWlmIChhcmdzLT5pbi5kb21haW5zICYgKEFNREdQVV9HRU1fRE9N QUlOX0dEUyB8CiAJICAgIEFNREdQVV9HRU1fRE9NQUlOX0dXUyB8IEFNREdQVV9HRU1fRE9NQUlO X09BKSkgewogCQlpZiAoZmxhZ3MgJiBBTURHUFVfR0VNX0NSRUFURV9WTV9BTFdBWVNfVkFMSUQp IHsKIAkJCS8qIGlmIGdkcyBibyBpcyBjcmVhdGVkIGZyb20gdXNlciBzcGFjZSwgaXQgbXVzdCBi ZQogCQkJICogcGFzc2VkIHRvIGJvIGxpc3QKIAkJCSAqLwogCQkJRFJNX0VSUk9SKCJHRFMgYm8g Y2Fubm90IGJlIHBlci12bS1ib1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCQlmbGFn cyB8PSBBTURHUFVfR0VNX0NSRUFURV9OT19DUFVfQUNDRVNTOwotCQkvKiBHRFMgYWxsb2NhdGlv bnMgbXVzdCBiZSBEVyBhbGlnbmVkICovCi0JCWlmIChhcmdzLT5pbi5kb21haW5zICYgQU1ER1BV X0dFTV9ET01BSU5fR0RTKQotCQkJc2l6ZSA9IEFMSUdOKHNpemUsIDQpOwogCX0KIAogCWlmIChm bGFncyAmIEFNREdQVV9HRU1fQ1JFQVRFX1ZNX0FMV0FZU19WQUxJRCkgewogCQlyID0gYW1kZ3B1 X2JvX3Jlc2VydmUodm0tPnJvb3QuYmFzZS5ibywgZmFsc2UpOwogCQlpZiAocikKIAkJCXJldHVy biByOwogCiAJCXJlc3YgPSB2bS0+cm9vdC5iYXNlLmJvLT50Ym8ucmVzdjsKIAl9CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwppbmRleCA3MjhlMTVlNWQ2OGEu LmZkOWM0YmVlYWFhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmpl Y3QuYwpAQCAtNDE5LDI2ICs0MTksMzQgQEAgc3RhdGljIGludCBhbWRncHVfYm9fZG9fY3JlYXRl KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkuaW50ZXJydXB0aWJsZSA9IChicC0+dHlw ZSAhPSB0dG1fYm9fdHlwZV9rZXJuZWwpLAogCQkubm9fd2FpdF9ncHUgPSBmYWxzZSwKIAkJLnJl c3YgPSBicC0+cmVzdiwKIAkJLmZsYWdzID0gVFRNX09QVF9GTEFHX0FMTE9XX1JFU19FVklDVAog CX07CiAJc3RydWN0IGFtZGdwdV9ibyAqYm87CiAJdW5zaWduZWQgbG9uZyBwYWdlX2FsaWduLCBz aXplID0gYnAtPnNpemU7CiAJc2l6ZV90IGFjY19zaXplOwogCWludCByOwogCi0JcGFnZV9hbGln biA9IHJvdW5kdXAoYnAtPmJ5dGVfYWxpZ24sIFBBR0VfU0laRSkgPj4gUEFHRV9TSElGVDsKLQlp ZiAoYnAtPmRvbWFpbiAmIChBTURHUFVfR0VNX0RPTUFJTl9HRFMgfCBBTURHUFVfR0VNX0RPTUFJ Tl9HV1MgfAotCQkJICBBTURHUFVfR0VNX0RPTUFJTl9PQSkpCisJLyogTm90ZSB0aGF0IEdEUy9H V1MvT0EgYWxsb2NhdGVzIDEgcGFnZSBwZXIgYnl0ZS9yZXNvdXJjZS4gKi8KKwlpZiAoYnAtPmRv bWFpbiAmIChBTURHUFVfR0VNX0RPTUFJTl9HV1MgfCBBTURHUFVfR0VNX0RPTUFJTl9PQSkpIHsK KwkJLyogR1dTIGFuZCBPQSBkb24ndCBuZWVkIGFueSBhbGlnbm1lbnQuICovCisJCXBhZ2VfYWxp Z24gPSBicC0+Ynl0ZV9hbGlnbjsKIAkJc2l6ZSA8PD0gUEFHRV9TSElGVDsKLQllbHNlCisJfSBl bHNlIGlmIChicC0+ZG9tYWluICYgQU1ER1BVX0dFTV9ET01BSU5fR0RTKSB7CisJCS8qIEJvdGgg c2l6ZSBhbmQgYWxpZ25tZW50IG11c3QgYmUgYSBtdWx0aXBsZSBvZiA0LiAqLworCQlwYWdlX2Fs aWduID0gQUxJR04oYnAtPmJ5dGVfYWxpZ24sIDQpOworCQlzaXplID0gQUxJR04oc2l6ZSwgNCkg PDwgUEFHRV9TSElGVDsKKwl9IGVsc2UgeworCQkvKiBNZW1vcnkgc2hvdWxkIGJlIGFsaWduZWQg YXQgbGVhc3QgdG8gYSBwYWdlIHNpemUuICovCisJCXBhZ2VfYWxpZ24gPSBBTElHTihicC0+Ynl0 ZV9hbGlnbiwgUEFHRV9TSVpFKSA+PiBQQUdFX1NISUZUOwogCQlzaXplID0gQUxJR04oc2l6ZSwg UEFHRV9TSVpFKTsKKwl9CiAKIAlpZiAoIWFtZGdwdV9ib192YWxpZGF0ZV9zaXplKGFkZXYsIHNp emUsIGJwLT5kb21haW4pKQogCQlyZXR1cm4gLUVOT01FTTsKIAogCSpib19wdHIgPSBOVUxMOwog CiAJYWNjX3NpemUgPSB0dG1fYm9fZG1hX2FjY19zaXplKCZhZGV2LT5tbWFuLmJkZXYsIHNpemUs CiAJCQkJICAgICAgIHNpemVvZihzdHJ1Y3QgYW1kZ3B1X2JvKSk7CiAKIAlibyA9IGt6YWxsb2Mo c2l6ZW9mKHN0cnVjdCBhbWRncHVfYm8pLCBHRlBfS0VSTkVMKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV90dG0uYwppbmRleCBiODUyYWJiOWRiMGYuLjczZTcxZTYxZGM5OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYwpAQCAtMTc0OSw0NyArMTc0OSw0 NyBAQCBpbnQgYW1kZ3B1X3R0bV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiAJ LyogSW5pdGlhbGl6ZSB2YXJpb3VzIG9uLWNoaXAgbWVtb3J5IHBvb2xzICovCiAJciA9IHR0bV9i b19pbml0X21tKCZhZGV2LT5tbWFuLmJkZXYsIEFNREdQVV9QTF9HRFMsCiAJCQkgICBhZGV2LT5n ZHMubWVtLnRvdGFsX3NpemUpOwogCWlmIChyKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIGluaXRp YWxpemluZyBHRFMgaGVhcC5cbiIpOwogCQlyZXR1cm4gcjsKIAl9CiAKIAlyID0gYW1kZ3B1X2Jv X2NyZWF0ZV9rZXJuZWwoYWRldiwgYWRldi0+Z2RzLm1lbS5nZnhfcGFydGl0aW9uX3NpemUsCi0J CQkJICAgIFBBR0VfU0laRSwgQU1ER1BVX0dFTV9ET01BSU5fR0RTLAorCQkJCSAgICA0LCBBTURH UFVfR0VNX0RPTUFJTl9HRFMsCiAJCQkJICAgICZhZGV2LT5nZHMuZ2RzX2dmeF9ibywgTlVMTCwg TlVMTCk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJciA9IHR0bV9ib19pbml0X21tKCZhZGV2 LT5tbWFuLmJkZXYsIEFNREdQVV9QTF9HV1MsCiAJCQkgICBhZGV2LT5nZHMuZ3dzLnRvdGFsX3Np emUpOwogCWlmIChyKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIGluaXRpYWxpemluZyBnd3MgaGVh cC5cbiIpOwogCQlyZXR1cm4gcjsKIAl9CiAKIAlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwo YWRldiwgYWRldi0+Z2RzLmd3cy5nZnhfcGFydGl0aW9uX3NpemUsCi0JCQkJICAgIFBBR0VfU0la RSwgQU1ER1BVX0dFTV9ET01BSU5fR1dTLAorCQkJCSAgICAxLCBBTURHUFVfR0VNX0RPTUFJTl9H V1MsCiAJCQkJICAgICZhZGV2LT5nZHMuZ3dzX2dmeF9ibywgTlVMTCwgTlVMTCk7CiAJaWYgKHIp CiAJCXJldHVybiByOwogCiAJciA9IHR0bV9ib19pbml0X21tKCZhZGV2LT5tbWFuLmJkZXYsIEFN REdQVV9QTF9PQSwKIAkJCSAgIGFkZXYtPmdkcy5vYS50b3RhbF9zaXplKTsKIAlpZiAocikgewog CQlEUk1fRVJST1IoIkZhaWxlZCBpbml0aWFsaXppbmcgb2EgaGVhcC5cbiIpOwogCQlyZXR1cm4g cjsKIAl9CiAKIAlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgYWRldi0+Z2RzLm9h LmdmeF9wYXJ0aXRpb25fc2l6ZSwKLQkJCQkgICAgUEFHRV9TSVpFLCBBTURHUFVfR0VNX0RPTUFJ Tl9PQSwKKwkJCQkgICAgMSwgQU1ER1BVX0dFTV9ET01BSU5fT0EsCiAJCQkJICAgICZhZGV2LT5n ZHMub2FfZ2Z4X2JvLCBOVUxMLCBOVUxMKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKIAkvKiBS ZWdpc3RlciBkZWJ1Z2ZzIGVudHJpZXMgZm9yIGFtZGdwdV90dG0gKi8KIAlyID0gYW1kZ3B1X3R0 bV9kZWJ1Z2ZzX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8g aW5pdCBkZWJ1Z2ZzXG4iKTsKIAkJcmV0dXJuIHI7CiAJfQotLSAKMi4xNy4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK