From: Alex Deucher Subject: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations Date: Fri, 28 Jul 2017 12:15:40 -0400 Message-ID: <1501258540-9950-1-git-send-email-alexander.deucher@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: Alex Deucher TWF5IHdhc3RlIGEgYml0IG9mIG1lbW9yeSwgYnV0IHNpbXBsaWZpZXMgdGhlIGludGVyZmFjZQpz aWduaWZpY2FudGx5LgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1 Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAg ICAgICB8ICA0IC0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMg fCA2NSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9yaW5nLmMgICB8IDY1ICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92NF8wLmMgICAgIHwgIDggKystLQog NCBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxMjIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBlZDFiNjg4Li5jODgwODUxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTE5MCwxMCArMTE5MCw2IEBAIHN0cnVjdCBh bWRncHVfd2IgewogCiBpbnQgYW1kZ3B1X3diX2dldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwgdTMyICp3Yik7CiB2b2lkIGFtZGdwdV93Yl9mcmVlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LCB1MzIgd2IpOwotaW50IGFtZGdwdV93Yl9nZXRfNjRiaXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIHUzMiAqd2IpOwotaW50IGFtZGdwdV93Yl9nZXRfMjU2Yml0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LCB1MzIgKndiKTsKLXZvaWQgYW1kZ3B1X3diX2ZyZWVfNjRiaXQoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiB3Yik7Ci12b2lkIGFtZGdwdV93Yl9mcmVlXzI1 NmJpdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHdiKTsKIAogdm9pZCBhbWRncHVf Z2V0X3BjaWVfaW5mbyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCBjMmRkZWIxLi5kNDIyMjc3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC01NzAsNDEg KzU3MCw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3diX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAgKi8KIGludCBhbWRncHVfd2JfZ2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCB1MzIgKndiKQogewotCXVuc2lnbmVkIGxvbmcgb2Zmc2V0ID0gZmluZF9maXJzdF96ZXJvX2Jp dChhZGV2LT53Yi51c2VkLCBhZGV2LT53Yi5udW1fd2IpOwotCWlmIChvZmZzZXQgPCBhZGV2LT53 Yi5udW1fd2IpIHsKLQkJX19zZXRfYml0KG9mZnNldCwgYWRldi0+d2IudXNlZCk7Ci0JCSp3YiA9 IG9mZnNldDsKLQkJcmV0dXJuIDA7Ci0JfSBlbHNlIHsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQot fQotCi0vKioKLSAqIGFtZGdwdV93Yl9nZXRfNjRiaXQgLSBBbGxvY2F0ZSBhIHdiIGVudHJ5Ci0g KgotICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgotICogQHdiOiB3YiBpbmRleAotICoK LSAqIEFsbG9jYXRlIGEgd2Igc2xvdCBmb3IgdXNlIGJ5IHRoZSBkcml2ZXIgKGFsbCBhc2ljcyku Ci0gKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciAtRUlOVkFMIG9uIGZhaWx1cmUuCi0gKi8KLWlu dCBhbWRncHVfd2JfZ2V0XzY0Yml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgKndi KQotewotCXVuc2lnbmVkIGxvbmcgb2Zmc2V0ID0gYml0bWFwX2ZpbmRfbmV4dF96ZXJvX2FyZWFf b2ZmKGFkZXYtPndiLnVzZWQsCi0JCQkJYWRldi0+d2IubnVtX3diLCAwLCAyLCA3LCAwKTsKLQlp ZiAoKG9mZnNldCArIDEpIDwgYWRldi0+d2IubnVtX3diKSB7Ci0JCV9fc2V0X2JpdChvZmZzZXQs IGFkZXYtPndiLnVzZWQpOwotCQlfX3NldF9iaXQob2Zmc2V0ICsgMSwgYWRldi0+d2IudXNlZCk7 Ci0JCSp3YiA9IG9mZnNldDsKLQkJcmV0dXJuIDA7Ci0JfSBlbHNlIHsKLQkJcmV0dXJuIC1FSU5W QUw7Ci0JfQotfQotCi1pbnQgYW1kZ3B1X3diX2dldF8yNTZiaXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIHUzMiAqd2IpCi17CiAJaW50IGkgPSAwOwogCXVuc2lnbmVkIGxvbmcgb2Zmc2V0 ID0gYml0bWFwX2ZpbmRfbmV4dF96ZXJvX2FyZWFfb2ZmKGFkZXYtPndiLnVzZWQsCiAJCQkJYWRl di0+d2IubnVtX3diLCAwLCA4LCA2MywgMCk7CkBAIC02MjgsMzYgKzU5Myw2IEBAIGludCBhbWRn cHVfd2JfZ2V0XzI1NmJpdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyICp3YikKICAq Lwogdm9pZCBhbWRncHVfd2JfZnJlZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHdi KQogewotCWlmICh3YiA8IGFkZXYtPndiLm51bV93YikKLQkJX19jbGVhcl9iaXQod2IsIGFkZXYt PndiLnVzZWQpOwotfQotCi0vKioKLSAqIGFtZGdwdV93Yl9mcmVlXzY0Yml0IC0gRnJlZSBhIHdi IGVudHJ5Ci0gKgotICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgotICogQHdiOiB3YiBp bmRleAotICoKLSAqIEZyZWUgYSB3YiBzbG90IGFsbG9jYXRlZCBmb3IgdXNlIGJ5IHRoZSBkcml2 ZXIgKGFsbCBhc2ljcykKLSAqLwotdm9pZCBhbWRncHVfd2JfZnJlZV82NGJpdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwgdTMyIHdiKQotewotCWlmICgod2IgKyAxKSA8IGFkZXYtPndiLm51 bV93YikgewotCQlfX2NsZWFyX2JpdCh3YiwgYWRldi0+d2IudXNlZCk7Ci0JCV9fY2xlYXJfYml0 KHdiICsgMSwgYWRldi0+d2IudXNlZCk7Ci0JfQotfQotCi0vKioKLSAqIGFtZGdwdV93Yl9mcmVl XzI1NmJpdCAtIEZyZWUgYSB3YiBlbnRyeQotICoKLSAqIEBhZGV2OiBhbWRncHVfZGV2aWNlIHBv aW50ZXIKLSAqIEB3Yjogd2IgaW5kZXgKLSAqCi0gKiBGcmVlIGEgd2Igc2xvdCBhbGxvY2F0ZWQg Zm9yIHVzZSBieSB0aGUgZHJpdmVyIChhbGwgYXNpY3MpCi0gKi8KLXZvaWQgYW1kZ3B1X3diX2Zy ZWVfMjU2Yml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgd2IpCi17CiAJaW50IGkg PSAwOwogCiAJaWYgKCh3YiArIDcpIDwgYWRldi0+d2IubnVtX3diKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMKaW5kZXggMzg3NGJlOC4uNzA0NDc1Njc0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMKQEAgLTE4NCw0NyArMTg0LDIyIEBA IGludCBhbWRncHVfcmluZ19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQlyZXR1cm4gcjsKIAl9CiAKLQlpZiAocmluZy0+ZnVuY3Mt PnN1cHBvcnRfNjRiaXRfcHRycykgewotCQlyID0gYW1kZ3B1X3diX2dldF82NGJpdChhZGV2LCAm cmluZy0+cnB0cl9vZmZzKTsKLQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVk KSByaW5nIHJwdHJfb2ZmcyB3YiBhbGxvYyBmYWlsZWRcbiIsIHIpOwotCQkJcmV0dXJuIHI7Ci0J CX0KLQotCQlyID0gYW1kZ3B1X3diX2dldF82NGJpdChhZGV2LCAmcmluZy0+d3B0cl9vZmZzKTsK LQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIHdwdHJfb2ZmcyB3 YiBhbGxvYyBmYWlsZWRcbiIsIHIpOwotCQkJcmV0dXJuIHI7Ci0JCX0KLQotCX0gZWxzZSB7Ci0J CXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZyaW5nLT5ycHRyX29mZnMpOwotCQlpZiAocikgewot CQkJZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIHJpbmcgcnB0cl9vZmZzIHdiIGFsbG9jIGZhaWxl ZFxuIiwgcik7Ci0JCQlyZXR1cm4gcjsKLQkJfQotCi0JCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYs ICZyaW5nLT53cHRyX29mZnMpOwotCQlpZiAocikgewotCQkJZGV2X2VycihhZGV2LT5kZXYsICIo JWQpIHJpbmcgd3B0cl9vZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7Ci0JCQlyZXR1cm4gcjsK LQkJfQotCisJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwgJnJpbmctPnJwdHJfb2Zmcyk7CisJaWYg KHIpIHsKKwkJZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIHJpbmcgcnB0cl9vZmZzIHdiIGFsbG9j IGZhaWxlZFxuIiwgcik7CisJCXJldHVybiByOwogCX0KIAotCWlmIChhbWRncHVfc3Jpb3ZfdmYo YWRldikgJiYgcmluZy0+ZnVuY3MtPnR5cGUgPT0gQU1ER1BVX1JJTkdfVFlQRV9HRlgpIHsKLQkJ ciA9IGFtZGdwdV93Yl9nZXRfMjU2Yml0KGFkZXYsICZyaW5nLT5mZW5jZV9vZmZzKTsKLQkJaWYg KHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIGZlbmNlX29mZnMgd2IgYWxs b2MgZmFpbGVkXG4iLCByKTsKLQkJCXJldHVybiByOwotCQl9CisJciA9IGFtZGdwdV93Yl9nZXQo YWRldiwgJnJpbmctPndwdHJfb2Zmcyk7CisJaWYgKHIpIHsKKwkJZGV2X2VycihhZGV2LT5kZXYs ICIoJWQpIHJpbmcgd3B0cl9vZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7CisJCXJldHVybiBy OworCX0KIAotCX0gZWxzZSB7Ci0JCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZyaW5nLT5mZW5j ZV9vZmZzKTsKLQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIGZl bmNlX29mZnMgd2IgYWxsb2MgZmFpbGVkXG4iLCByKTsKLQkJCXJldHVybiByOwotCQl9CisJciA9 IGFtZGdwdV93Yl9nZXQoYWRldiwgJnJpbmctPmZlbmNlX29mZnMpOworCWlmIChyKSB7CisJCWRl dl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIGZlbmNlX29mZnMgd2IgYWxsb2MgZmFpbGVkXG4i LCByKTsKKwkJcmV0dXJuIHI7CiAJfQogCiAJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwgJnJpbmct PmNvbmRfZXhlX29mZnMpOwpAQCAtMjg2LDE5ICsyNjEsMTEgQEAgdm9pZCBhbWRncHVfcmluZ19m aW5pKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlyaW5nLT5yZWFkeSA9IGZhbHNlOwog Ci0JaWYgKHJpbmctPmZ1bmNzLT5zdXBwb3J0XzY0Yml0X3B0cnMpIHsKLQkJYW1kZ3B1X3diX2Zy ZWVfNjRiaXQocmluZy0+YWRldiwgcmluZy0+cnB0cl9vZmZzKTsKLQkJYW1kZ3B1X3diX2ZyZWVf NjRiaXQocmluZy0+YWRldiwgcmluZy0+d3B0cl9vZmZzKTsKLQl9IGVsc2UgewotCQlhbWRncHVf d2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5ycHRyX29mZnMpOwotCQlhbWRncHVfd2JfZnJlZShy aW5nLT5hZGV2LCByaW5nLT53cHRyX29mZnMpOwotCX0KKwlhbWRncHVfd2JfZnJlZShyaW5nLT5h ZGV2LCByaW5nLT5ycHRyX29mZnMpOworCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmct PndwdHJfb2Zmcyk7CiAKIAlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5jb25kX2V4 ZV9vZmZzKTsKLQlpZiAoYW1kZ3B1X3NyaW92X3ZmKHJpbmctPmFkZXYpICYmIHJpbmctPmZ1bmNz LT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVfR0ZYKQotCQlhbWRncHVfd2JfZnJlZV8yNTZiaXQo cmluZy0+YWRldiwgcmluZy0+ZmVuY2Vfb2Zmcyk7Ci0JZWxzZQotCQlhbWRncHVfd2JfZnJlZShy aW5nLT5hZGV2LCByaW5nLT5mZW5jZV9vZmZzKTsKKwlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2 LCByaW5nLT5mZW5jZV9vZmZzKTsKIAogCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmcmluZy0+cmlu Z19vYmosCiAJCQkgICAgICAmcmluZy0+Z3B1X2FkZHIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3NkbWFfdjRfMC5jCmluZGV4IDVjMjQ3MDguLjgyNzNlNjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3NkbWFfdjRfMC5jCkBAIC0xMjc4LDggKzEyNzgsOCBAQCBzdGF0aWMgaW50IHNkbWFf djRfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJCQkgICAgIEFNREdQVV9TRE1BX0lSUV9UUkFQ MSk7CiAKIAkJaWYgKGFtZGdwdV9zcmlvdl92ZihhZGV2KSkgewotCQkJciA9IGFtZGdwdV93Yl9n ZXRfNjRiaXQoYWRldiwKLQkJCQkJCSZhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBvbGxfbWVtX29m ZnMpOworCQkJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwKKwkJCQkJICAmYWRldi0+c2RtYS5pbnN0 YW5jZVtpXS5wb2xsX21lbV9vZmZzKTsKIAkJCWlmIChyKSB7CiAJCQkJZGV2X2VycihhZGV2LT5k ZXYsICIoJWQpIGZhaWxlZCB0byBhbGxvY2F0ZSBTRE1BIHBvbGwgbWVtIHdiLlxuIiwgcik7CiAJ CQkJcmV0dXJuIHI7CkBAIC0xMzAxLDggKzEzMDEsOCBAQCBzdGF0aWMgaW50IHNkbWFfdjRfMF9z d19maW5pKHZvaWQgKmhhbmRsZSkKIAkJYW1kZ3B1X3JpbmdfZmluaSgmYWRldi0+c2RtYS5pbnN0 YW5jZVtpXS5yaW5nKTsKIAogCQlpZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpKQotCQkJYW1kZ3B1 X3diX2ZyZWVfNjRiaXQoYWRldiwKLQkJCQkJICAgICBhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBv bGxfbWVtX29mZnMpOworCQkJYW1kZ3B1X3diX2ZyZWUoYWRldiwKKwkJCQkgICAgICAgYWRldi0+ c2RtYS5pbnN0YW5jZVtpXS5wb2xsX21lbV9vZmZzKTsKIAl9CiAJcmV0dXJuIDA7CiB9Ci0tIAoy LjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1k LWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==