From: Alex Deucher Subject: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations (v2) Date: Fri, 28 Jul 2017 19:29:56 -0400 Message-ID: <1501284596-4175-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 aWduaWZpY2FudGx5LgoKdjI6IGNvbnZlcnQgaW50ZXJuYWwgYWNjb3VudGluZyB0byB1c2UgMjU2 Yml0IHNsb3RzCgpSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5p Z0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVy QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAg IHwgIDQgLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyB8IDc3 ICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3JpbmcuYyAgIHwgNjUgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxl cyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBkNDkyZmY3Li4xOWVlMmE0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTEzMSwxMCArMTEzMSw2IEBAIHN0cnVjdCBhbWRncHVf d2IgewogCiBpbnQgYW1kZ3B1X3diX2dldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMy ICp3Yik7CiB2b2lkIGFtZGdwdV93Yl9mcmVlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1 MzIgd2IpOwotaW50IGFtZGdwdV93Yl9nZXRfNjRiaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsIHUzMiAqd2IpOwotaW50IGFtZGdwdV93Yl9nZXRfMjU2Yml0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LCB1MzIgKndiKTsKLXZvaWQgYW1kZ3B1X3diX2ZyZWVfNjRiaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiB3Yik7Ci12b2lkIGFtZGdwdV93Yl9mcmVlXzI1NmJpdChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHdiKTsKIAogdm9pZCBhbWRncHVfZ2V0X3Bj aWVfaW5mbyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCBmYzZmOGQ1Li42MmFmZTNjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC01MDQsNyArNTA0LDgg QEAgc3RhdGljIGludCBhbWRncHVfd2JfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAlpbnQgcjsKIAogCWlmIChhZGV2LT53Yi53Yl9vYmogPT0gTlVMTCkgewotCQlyID0gYW1kZ3B1 X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgQU1ER1BVX01BWF9XQiAqIHNpemVvZih1aW50MzJfdCks CisJCS8qIEFNREdQVV9NQVhfV0IgKiBzaXplb2YodWludDMyX3QpICogOCA9IEFNREdQVV9NQVhf V0IgMjU2Yml0IHNsb3RzICovCisJCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBB TURHUFVfTUFYX1dCICogc2l6ZW9mKHVpbnQzMl90KSAqIDgsCiAJCQkJCSAgICBQQUdFX1NJWkUs IEFNREdQVV9HRU1fRE9NQUlOX0dUVCwKIAkJCQkJICAgICZhZGV2LT53Yi53Yl9vYmosICZhZGV2 LT53Yi5ncHVfYWRkciwKIAkJCQkJICAgICh2b2lkICoqKSZhZGV2LT53Yi53Yik7CkBAIC01MzUs NDcgKzUzNiwxMCBAQCBzdGF0aWMgaW50IGFtZGdwdV93Yl9pbml0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogaW50IGFtZGdwdV93Yl9nZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs IHUzMiAqd2IpCiB7CiAJdW5zaWduZWQgbG9uZyBvZmZzZXQgPSBmaW5kX2ZpcnN0X3plcm9fYml0 KGFkZXYtPndiLnVzZWQsIGFkZXYtPndiLm51bV93Yik7Ci0JaWYgKG9mZnNldCA8IGFkZXYtPndi Lm51bV93YikgewotCQlfX3NldF9iaXQob2Zmc2V0LCBhZGV2LT53Yi51c2VkKTsKLQkJKndiID0g b2Zmc2V0OwotCQlyZXR1cm4gMDsKLQl9IGVsc2UgewotCQlyZXR1cm4gLUVJTlZBTDsKLQl9Ci19 CiAKLS8qKgotICogYW1kZ3B1X3diX2dldF82NGJpdCAtIEFsbG9jYXRlIGEgd2IgZW50cnkKLSAq Ci0gKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCi0gKiBAd2I6IHdiIGluZGV4Ci0gKgot ICogQWxsb2NhdGUgYSB3YiBzbG90IGZvciB1c2UgYnkgdGhlIGRyaXZlciAoYWxsIGFzaWNzKS4K LSAqIFJldHVybnMgMCBvbiBzdWNjZXNzIG9yIC1FSU5WQUwgb24gZmFpbHVyZS4KLSAqLwotaW50 IGFtZGdwdV93Yl9nZXRfNjRiaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiAqd2Ip Ci17Ci0JdW5zaWduZWQgbG9uZyBvZmZzZXQgPSBiaXRtYXBfZmluZF9uZXh0X3plcm9fYXJlYV9v ZmYoYWRldi0+d2IudXNlZCwKLQkJCQlhZGV2LT53Yi5udW1fd2IsIDAsIDIsIDcsIDApOwotCWlm ICgob2Zmc2V0ICsgMSkgPCBhZGV2LT53Yi5udW1fd2IpIHsKKwlpZiAob2Zmc2V0IDwgYWRldi0+ d2IubnVtX3diKSB7CiAJCV9fc2V0X2JpdChvZmZzZXQsIGFkZXYtPndiLnVzZWQpOwotCQlfX3Nl dF9iaXQob2Zmc2V0ICsgMSwgYWRldi0+d2IudXNlZCk7Ci0JCSp3YiA9IG9mZnNldDsKLQkJcmV0 dXJuIDA7Ci0JfSBlbHNlIHsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQotfQotCi1pbnQgYW1kZ3B1 X3diX2dldF8yNTZiaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiAqd2IpCi17Ci0J aW50IGkgPSAwOwotCXVuc2lnbmVkIGxvbmcgb2Zmc2V0ID0gYml0bWFwX2ZpbmRfbmV4dF96ZXJv X2FyZWFfb2ZmKGFkZXYtPndiLnVzZWQsCi0JCQkJYWRldi0+d2IubnVtX3diLCAwLCA4LCA2Mywg MCk7Ci0JaWYgKChvZmZzZXQgKyA3KSA8IGFkZXYtPndiLm51bV93YikgewotCQlmb3IgKGkgPSAw OyBpIDwgODsgaSsrKQotCQkJX19zZXRfYml0KG9mZnNldCArIGksIGFkZXYtPndiLnVzZWQpOwot CQkqd2IgPSBvZmZzZXQ7CisJCSp3YiA9IG9mZnNldCAqIDg7IC8qIGNvbnZlcnQgdG8gZHcgb2Zm c2V0ICovCiAJCXJldHVybiAwOwogCX0gZWxzZSB7CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtNTk3 LDM5ICs1NjEsNiBAQCB2b2lkIGFtZGdwdV93Yl9mcmVlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LCB1MzIgd2IpCiB9CiAKIC8qKgotICogYW1kZ3B1X3diX2ZyZWVfNjRiaXQgLSBGcmVlIGEg d2IgZW50cnkKLSAqCi0gKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCi0gKiBAd2I6IHdi IGluZGV4Ci0gKgotICogRnJlZSBhIHdiIHNsb3QgYWxsb2NhdGVkIGZvciB1c2UgYnkgdGhlIGRy aXZlciAoYWxsIGFzaWNzKQotICovCi12b2lkIGFtZGdwdV93Yl9mcmVlXzY0Yml0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCB1MzIgd2IpCi17Ci0JaWYgKCh3YiArIDEpIDwgYWRldi0+d2Iu bnVtX3diKSB7Ci0JCV9fY2xlYXJfYml0KHdiLCBhZGV2LT53Yi51c2VkKTsKLQkJX19jbGVhcl9i aXQod2IgKyAxLCBhZGV2LT53Yi51c2VkKTsKLQl9Ci19Ci0KLS8qKgotICogYW1kZ3B1X3diX2Zy ZWVfMjU2Yml0IC0gRnJlZSBhIHdiIGVudHJ5Ci0gKgotICogQGFkZXY6IGFtZGdwdV9kZXZpY2Ug cG9pbnRlcgotICogQHdiOiB3YiBpbmRleAotICoKLSAqIEZyZWUgYSB3YiBzbG90IGFsbG9jYXRl ZCBmb3IgdXNlIGJ5IHRoZSBkcml2ZXIgKGFsbCBhc2ljcykKLSAqLwotdm9pZCBhbWRncHVfd2Jf ZnJlZV8yNTZiaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiB3YikKLXsKLQlpbnQg aSA9IDA7Ci0KLQlpZiAoKHdiICsgNykgPCBhZGV2LT53Yi5udW1fd2IpCi0JCWZvciAoaSA9IDA7 IGkgPCA4OyBpKyspCi0JCQlfX2NsZWFyX2JpdCh3YiArIGksIGFkZXYtPndiLnVzZWQpOwotfQot Ci0vKioKICAqIGFtZGdwdV92cmFtX2xvY2F0aW9uIC0gdHJ5IHRvIGZpbmQgVlJBTSBsb2NhdGlv bgogICogQGFkZXY6IGFtZGdwdSBkZXZpY2Ugc3RydWN0dXJlIGhvbGRpbmcgYWxsIG5lY2Vzc2Fy eSBpbmZvcm1hdGlvbnMKICAqIEBtYzogbWVtb3J5IGNvbnRyb2xsZXIgc3RydWN0dXJlIGhvbGRp bmcgbWVtb3J5IGluZm9ybWF0aW9ucwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3JpbmcuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9y aW5nLmMKaW5kZXggMzg3NGJlOC4uNzA0NDc1Njc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9yaW5nLmMKQEAgLTE4NCw0NyArMTg0LDIyIEBAIGludCBhbWRncHVfcmluZ19p bml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcs CiAJCQlyZXR1cm4gcjsKIAl9CiAKLQlpZiAocmluZy0+ZnVuY3MtPnN1cHBvcnRfNjRiaXRfcHRy cykgewotCQlyID0gYW1kZ3B1X3diX2dldF82NGJpdChhZGV2LCAmcmluZy0+cnB0cl9vZmZzKTsK LQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIHJwdHJfb2ZmcyB3 YiBhbGxvYyBmYWlsZWRcbiIsIHIpOwotCQkJcmV0dXJuIHI7Ci0JCX0KLQotCQlyID0gYW1kZ3B1 X3diX2dldF82NGJpdChhZGV2LCAmcmluZy0+d3B0cl9vZmZzKTsKLQkJaWYgKHIpIHsKLQkJCWRl dl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIHdwdHJfb2ZmcyB3YiBhbGxvYyBmYWlsZWRcbiIs IHIpOwotCQkJcmV0dXJuIHI7Ci0JCX0KLQotCX0gZWxzZSB7Ci0JCXIgPSBhbWRncHVfd2JfZ2V0 KGFkZXYsICZyaW5nLT5ycHRyX29mZnMpOwotCQlpZiAocikgewotCQkJZGV2X2VycihhZGV2LT5k ZXYsICIoJWQpIHJpbmcgcnB0cl9vZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7Ci0JCQlyZXR1 cm4gcjsKLQkJfQotCi0JCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZyaW5nLT53cHRyX29mZnMp OwotCQlpZiAocikgewotCQkJZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIHJpbmcgd3B0cl9vZmZz IHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7Ci0JCQlyZXR1cm4gcjsKLQkJfQotCisJciA9IGFtZGdw dV93Yl9nZXQoYWRldiwgJnJpbmctPnJwdHJfb2Zmcyk7CisJaWYgKHIpIHsKKwkJZGV2X2Vycihh ZGV2LT5kZXYsICIoJWQpIHJpbmcgcnB0cl9vZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7CisJ CXJldHVybiByOwogCX0KIAotCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRldikgJiYgcmluZy0+ZnVu Y3MtPnR5cGUgPT0gQU1ER1BVX1JJTkdfVFlQRV9HRlgpIHsKLQkJciA9IGFtZGdwdV93Yl9nZXRf MjU2Yml0KGFkZXYsICZyaW5nLT5mZW5jZV9vZmZzKTsKLQkJaWYgKHIpIHsKLQkJCWRldl9lcnIo YWRldi0+ZGV2LCAiKCVkKSByaW5nIGZlbmNlX29mZnMgd2IgYWxsb2MgZmFpbGVkXG4iLCByKTsK LQkJCXJldHVybiByOwotCQl9CisJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwgJnJpbmctPndwdHJf b2Zmcyk7CisJaWYgKHIpIHsKKwkJZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIHJpbmcgd3B0cl9v ZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwgcik7CisJCXJldHVybiByOworCX0KIAotCX0gZWxzZSB7 Ci0JCXIgPSBhbWRncHVfd2JfZ2V0KGFkZXYsICZyaW5nLT5mZW5jZV9vZmZzKTsKLQkJaWYgKHIp IHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSByaW5nIGZlbmNlX29mZnMgd2IgYWxsb2Mg ZmFpbGVkXG4iLCByKTsKLQkJCXJldHVybiByOwotCQl9CisJciA9IGFtZGdwdV93Yl9nZXQoYWRl diwgJnJpbmctPmZlbmNlX29mZnMpOworCWlmIChyKSB7CisJCWRldl9lcnIoYWRldi0+ZGV2LCAi KCVkKSByaW5nIGZlbmNlX29mZnMgd2IgYWxsb2MgZmFpbGVkXG4iLCByKTsKKwkJcmV0dXJuIHI7 CiAJfQogCiAJciA9IGFtZGdwdV93Yl9nZXQoYWRldiwgJnJpbmctPmNvbmRfZXhlX29mZnMpOwpA QCAtMjg2LDE5ICsyNjEsMTEgQEAgdm9pZCBhbWRncHVfcmluZ19maW5pKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIHsKIAlyaW5nLT5yZWFkeSA9IGZhbHNlOwogCi0JaWYgKHJpbmctPmZ1bmNz LT5zdXBwb3J0XzY0Yml0X3B0cnMpIHsKLQkJYW1kZ3B1X3diX2ZyZWVfNjRiaXQocmluZy0+YWRl diwgcmluZy0+cnB0cl9vZmZzKTsKLQkJYW1kZ3B1X3diX2ZyZWVfNjRiaXQocmluZy0+YWRldiwg cmluZy0+d3B0cl9vZmZzKTsKLQl9IGVsc2UgewotCQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2 LCByaW5nLT5ycHRyX29mZnMpOwotCQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT53 cHRyX29mZnMpOwotCX0KKwlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5ycHRyX29m ZnMpOworCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmctPndwdHJfb2Zmcyk7CiAKIAlh bWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5jb25kX2V4ZV9vZmZzKTsKLQlpZiAoYW1k Z3B1X3NyaW92X3ZmKHJpbmctPmFkZXYpICYmIHJpbmctPmZ1bmNzLT50eXBlID09IEFNREdQVV9S SU5HX1RZUEVfR0ZYKQotCQlhbWRncHVfd2JfZnJlZV8yNTZiaXQocmluZy0+YWRldiwgcmluZy0+ ZmVuY2Vfb2Zmcyk7Ci0JZWxzZQotCQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5m ZW5jZV9vZmZzKTsKKwlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT5mZW5jZV9vZmZz KTsKIAogCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmcmluZy0+cmluZ19vYmosCiAJCQkgICAgICAm cmluZy0+Z3B1X2FkZHIsCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9hbWQtZ2Z4Cg==