From: Alex Deucher Subject: [PATCH 3/3] drm/amdgpu/gfx9: adjust mqd allocation size Date: Fri, 18 Aug 2017 23:57:51 -0400 Message-ID: <1503115071-19075-3-git-send-email-alexander.deucher@amd.com> References: <1503115071-19075-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: In-Reply-To: <1503115071-19075-1-git-send-email-alexander.deucher-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: Alex Deucher dG8gYWxsb2NhdGUgYWRkaXRpb25hbCBzcGFjZSBmb3IgdGhlIGR5bmFtaWMgY3UgbWFza3MuCgpT aWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyAgICB8IDI1ICsrKysrKysr KysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvaW5jbHVkZS92OV9zdHJ1Y3Rz LmggfCAgOCArKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCA3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmluZGV4IDY5MTgy ZWUuLjdjMDZkMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAtMTM0 Niw3ICsxMzQ2LDcgQEAgc3RhdGljIGludCBnZnhfdjlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkK IAkJcmV0dXJuIHI7CiAKIAkvKiBjcmVhdGUgTVFEIGZvciBhbGwgY29tcHV0ZSBxdWV1ZXMgYXMg d2VsIGFzIEtJUSBmb3IgU1JJT1YgY2FzZSAqLwotCXIgPSBhbWRncHVfZ2Z4X2NvbXB1dGVfbXFk X3N3X2luaXQoYWRldiwgc2l6ZW9mKHN0cnVjdCB2OV9tcWQpKTsKKwlyID0gYW1kZ3B1X2dmeF9j b21wdXRlX21xZF9zd19pbml0KGFkZXYsIHNpemVvZihzdHJ1Y3QgdjlfbXFkX2FsbG9jYXRpb24p KTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKQEAgLTI0NjMsNiArMjQ2MywxMyBAQCBzdGF0aWMg aW50IGdmeF92OV8wX21xZF9pbml0KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAltcWQtPmNv bXB1dGVfc3RhdGljX3RocmVhZF9tZ210X3NlMyA9IDB4ZmZmZmZmZmY7CiAJbXFkLT5jb21wdXRl X21pc2NfcmVzZXJ2ZWQgPSAweDAwMDAwMDAzOwogCisJbXFkLT5keW5hbWljX2N1X21hc2tfYWRk cl9sbyA9CisJCWxvd2VyXzMyX2JpdHMocmluZy0+bXFkX2dwdV9hZGRyCisJCQkgICAgICArIG9m ZnNldG9mKHN0cnVjdCB2OV9tcWRfYWxsb2NhdGlvbiwgZHluYW1pY19jdV9tYXNrKSk7CisJbXFk LT5keW5hbWljX2N1X21hc2tfYWRkcl9oaSA9CisJCXVwcGVyXzMyX2JpdHMocmluZy0+bXFkX2dw dV9hZGRyCisJCQkgICAgICArIG9mZnNldG9mKHN0cnVjdCB2OV9tcWRfYWxsb2NhdGlvbiwgZHlu YW1pY19jdV9tYXNrKSk7CisKIAllb3BfYmFzZV9hZGRyID0gcmluZy0+ZW9wX2dwdV9hZGRyID4+ IDg7CiAJbXFkLT5jcF9ocWRfZW9wX2Jhc2VfYWRkcl9sbyA9IGVvcF9iYXNlX2FkZHI7CiAJbXFk LT5jcF9ocWRfZW9wX2Jhc2VfYWRkcl9oaSA9IHVwcGVyXzMyX2JpdHMoZW9wX2Jhc2VfYWRkcik7 CkBAIC0yNjk1LDcgKzI3MDIsNyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVl KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAlpZiAoYWRldi0+Z2Z4LmluX3Jlc2V0KSB7IC8q IGZvciBHUFVfUkVTRVQgY2FzZSAqLwogCQkvKiByZXNldCBNUUQgdG8gYSBjbGVhbiBzdGF0dXMg Ki8KIAkJaWYgKGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSkKLQkJCW1lbWNweSht cWQsIGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgc2l6ZW9mKCptcWQpKTsKKwkJ CW1lbWNweShtcWQsIGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgc2l6ZW9mKHN0 cnVjdCB2OV9tcWRfYWxsb2NhdGlvbikpOwogCiAJCS8qIHJlc2V0IHJpbmcgYnVmZmVyICovCiAJ CXJpbmctPndwdHIgPSAwOwpAQCAtMjcwNyw3ICsyNzE0LDkgQEAgc3RhdGljIGludCBnZnhfdjlf MF9raXFfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJCXNvYzE1X2dyYm1f c2VsZWN0KGFkZXYsIDAsIDAsIDAsIDApOwogCQltdXRleF91bmxvY2soJmFkZXYtPnNyYm1fbXV0 ZXgpOwogCX0gZWxzZSB7Ci0JCW1lbXNldCgodm9pZCAqKW1xZCwgMCwgc2l6ZW9mKCptcWQpKTsK KwkJbWVtc2V0KCh2b2lkICopbXFkLCAwLCBzaXplb2Yoc3RydWN0IHY5X21xZF9hbGxvY2F0aW9u KSk7CisJCSgoc3RydWN0IHY5X21xZF9hbGxvY2F0aW9uICopbXFkKS0+ZHluYW1pY19jdV9tYXNr ID0gMHhGRkZGRkZGRjsKKwkJKChzdHJ1Y3QgdjlfbXFkX2FsbG9jYXRpb24gKiltcWQpLT5keW5h bWljX3JiX21hc2sgPSAweEZGRkZGRkZGOwogCQltdXRleF9sb2NrKCZhZGV2LT5zcmJtX211dGV4 KTsKIAkJc29jMTVfZ3JibV9zZWxlY3QoYWRldiwgcmluZy0+bWUsIHJpbmctPnBpcGUsIHJpbmct PnF1ZXVlLCAwKTsKIAkJZ2Z4X3Y5XzBfbXFkX2luaXQocmluZyk7CkBAIC0yNzE2LDcgKzI3MjUs NyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmlu ZyAqcmluZykKIAkJbXV0ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKIAogCQlpZiAoYWRl di0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdKQotCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMu bXFkX2JhY2t1cFttcWRfaWR4XSwgbXFkLCBzaXplb2YoKm1xZCkpOworCQkJbWVtY3B5KGFkZXYt PmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgbXFkLCBzaXplb2Yoc3RydWN0IHY5X21xZF9h bGxvY2F0aW9uKSk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0yNzI5LDcgKzI3MzgsOSBAQCBzdGF0 aWMgaW50IGdmeF92OV8wX2tjcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykK IAlpbnQgbXFkX2lkeCA9IHJpbmcgLSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1swXTsKIAogCWlm ICghYWRldi0+Z2Z4LmluX3Jlc2V0ICYmICFhZGV2LT5nZnguaW5fc3VzcGVuZCkgewotCQltZW1z ZXQoKHZvaWQgKiltcWQsIDAsIHNpemVvZigqbXFkKSk7CisJCW1lbXNldCgodm9pZCAqKW1xZCwg MCwgc2l6ZW9mKHN0cnVjdCB2OV9tcWRfYWxsb2NhdGlvbikpOworCQkoKHN0cnVjdCB2OV9tcWRf YWxsb2NhdGlvbiAqKW1xZCktPmR5bmFtaWNfY3VfbWFzayA9IDB4RkZGRkZGRkY7CisJCSgoc3Ry dWN0IHY5X21xZF9hbGxvY2F0aW9uICopbXFkKS0+ZHluYW1pY19yYl9tYXNrID0gMHhGRkZGRkZG RjsKIAkJbXV0ZXhfbG9jaygmYWRldi0+c3JibV9tdXRleCk7CiAJCXNvYzE1X2dyYm1fc2VsZWN0 KGFkZXYsIHJpbmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSwgMCk7CiAJCWdmeF92OV8w X21xZF9pbml0KHJpbmcpOwpAQCAtMjczNywxMSArMjc0OCwxMSBAQCBzdGF0aWMgaW50IGdmeF92 OV8wX2tjcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAkJbXV0ZXhfdW5s b2NrKCZhZGV2LT5zcmJtX211dGV4KTsKIAogCQlpZiAoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3Vw W21xZF9pZHhdKQotCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwg bXFkLCBzaXplb2YoKm1xZCkpOworCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFtt cWRfaWR4XSwgbXFkLCBzaXplb2Yoc3RydWN0IHY5X21xZF9hbGxvY2F0aW9uKSk7CiAJfSBlbHNl IGlmIChhZGV2LT5nZnguaW5fcmVzZXQpIHsgLyogZm9yIEdQVV9SRVNFVCBjYXNlICovCiAJCS8q IHJlc2V0IE1RRCB0byBhIGNsZWFuIHN0YXR1cyAqLwogCQlpZiAoYWRldi0+Z2Z4Lm1lYy5tcWRf YmFja3VwW21xZF9pZHhdKQotCQkJbWVtY3B5KG1xZCwgYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3Vw W21xZF9pZHhdLCBzaXplb2YoKm1xZCkpOworCQkJbWVtY3B5KG1xZCwgYWRldi0+Z2Z4Lm1lYy5t cWRfYmFja3VwW21xZF9pZHhdLCBzaXplb2Yoc3RydWN0IHY5X21xZF9hbGxvY2F0aW9uKSk7CiAK IAkJLyogcmVzZXQgcmluZyBidWZmZXIgKi8KIAkJcmluZy0+d3B0ciA9IDA7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvdjlfc3RydWN0cy5oIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9pbmNsdWRlL3Y5X3N0cnVjdHMuaAppbmRleCA1NmQ3OWRiLi4yZmIyNWFiIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUvdjlfc3RydWN0cy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvaW5jbHVkZS92OV9zdHJ1Y3RzLmgKQEAgLTY3Miw2ICs2NzIsMTQg QEAgc3RydWN0IHY5X21xZCB7CiAJdWludDMyX3QgcmVzZXJ2ZWRfNTExOwogfTsKIAorc3RydWN0 IHY5X21xZF9hbGxvY2F0aW9uIHsKKwlzdHJ1Y3QgdjlfbXFkIG1xZDsKKwl1aW50MzJfdCB3cHRy X3BvbGxfbWVtOworCXVpbnQzMl90IHJwdHJfcmVwb3J0X21lbTsKKwl1aW50MzJfdCBkeW5hbWlj X2N1X21hc2s7CisJdWludDMyX3QgZHluYW1pY19yYl9tYXNrOworfTsKKwogLyogZnJvbSB2ZWdh MTAgYWxsIENTQSBmb3JtYXQgaXMgc2hpZnRlZCB0byBjaGFpbiBpYiBjb21wYXRpYmxlIG1vZGUg Ki8KIHN0cnVjdCB2OV9jZV9pYl9zdGF0ZSB7CiAgICAgLyogc2VjdGlvbiBvZiBub24gY2hhaW5l ZCBpYiBwYXJ0ICovCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4Cg==