From: Monk Liu Subject: [PATCH] drm/amdgpu:fix gfx fence allocate size Date: Tue, 18 Jul 2017 12:40:22 +0800 Message-ID: <1500352822-29824-1-git-send-email-Monk.Liu@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: Xiangliang Yu , Monk Liu MSwgZm9yIHNyaW92LCB3ZSBuZWVkIDhkdyBmb3IgdGhlIGdmeCBmZW5jZSBkdWUgdG8gQ1AKYmVo YXZpb3VyCjIsIGNsZWFudXAgd3JvbmcgbG9naWMgaW4gd3B0ci9ycHRyIHdiIGFsbG9jIGFuZCBm cmVlCgpDaGFuZ2UtSWQ6IElmYmZlZDE3YTQ2MjFkYWU1NzI0NDk0MmZmYWM3ZGUxNzQzZGUwMjk0 ClNpZ25lZC1vZmYtYnk6IE1vbmsgTGl1IDxNb25rLkxpdUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5 OiBYaWFuZ2xpYW5nIFl1IDxYaWFuZ2xpYW5nLll1QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyB8IDMyICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYyAgIHwgMjYgKysr KysrKysrKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyks IDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBmNjM0 NWI5Li5mZTk2MjM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTE5MSw3 ICsxMTkxLDkgQEAgc3RydWN0IGFtZGdwdV93YiB7CiBpbnQgYW1kZ3B1X3diX2dldChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwgdTMyICp3Yik7CiB2b2lkIGFtZGdwdV93Yl9mcmVlKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgd2IpOwogaW50IGFtZGdwdV93Yl9nZXRfNjRiaXQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiAqd2IpOworaW50IGFtZGdwdV93Yl9nZXRf MjU2Qml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgKndiKTsKIHZvaWQgYW1kZ3B1 X3diX2ZyZWVfNjRiaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHUzMiB3Yik7Cit2b2lk IGFtZGdwdV93Yl9mcmVlXzI1NmJpdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHdi KTsKIAogdm9pZCBhbWRncHVfZ2V0X3BjaWVfaW5mbyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp Y2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCA3 ZTExMTkwLi42MDUwODA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rl dmljZS5jCkBAIC02MDMsNiArNjAzLDIxIEBAIGludCBhbWRncHVfd2JfZ2V0XzY0Yml0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgKndiKQogCX0KIH0KIAoraW50IGFtZGdwdV93Yl9n ZXRfMjU2Qml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1MzIgKndiKQoreworCWludCBp ID0gMDsKKwl1bnNpZ25lZCBsb25nIG9mZnNldCA9IGJpdG1hcF9maW5kX25leHRfemVyb19hcmVh X29mZihhZGV2LT53Yi51c2VkLAorCQkJCWFkZXYtPndiLm51bV93YiwgMCwgOCwgNjMsIDApOwor CWlmICgob2Zmc2V0ICsgNykgPCBhZGV2LT53Yi5udW1fd2IpIHsKKwkJZm9yIChpID0gMDsgaSA8 IDg7IGkrKykKKwkJCV9fc2V0X2JpdChvZmZzZXQgKyBpLCBhZGV2LT53Yi51c2VkKTsKKwkJKndi ID0gb2Zmc2V0OworCQlyZXR1cm4gMDsKKwl9IGVsc2UgeworCQlyZXR1cm4gLUVJTlZBTDsKKwl9 Cit9CisKIC8qKgogICogYW1kZ3B1X3diX2ZyZWUgLSBGcmVlIGEgd2IgZW50cnkKICAqCkBAIC02 MzQsNiArNjQ5LDIzIEBAIHZvaWQgYW1kZ3B1X3diX2ZyZWVfNjRiaXQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIHUzMiB3YikKIH0KIAogLyoqCisgKiBhbWRncHVfd2JfZnJlZV8yNTZiaXQg LSBGcmVlIGEgd2IgZW50cnkKKyAqCisgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCisg KiBAd2I6IHdiIGluZGV4CisgKgorICogRnJlZSBhIHdiIHNsb3QgYWxsb2NhdGVkIGZvciB1c2Ug YnkgdGhlIGRyaXZlciAoYWxsIGFzaWNzKQorICovCit2b2lkIGFtZGdwdV93Yl9mcmVlXzI1NmJp dChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTMyIHdiKQoreworCWludCBpID0gMDsKKwor CWlmICgod2IgKyA3KSA8IGFkZXYtPndiLm51bV93YikKKwkJZm9yIChpID0gMDsgaSA8IDg7IGkr KykKKwkJCV9fY2xlYXJfYml0KHdiICsgaSwgYWRldi0+d2IudXNlZCk7Cit9CisKKy8qKgogICog YW1kZ3B1X3ZyYW1fbG9jYXRpb24gLSB0cnkgdG8gZmluZCBWUkFNIGxvY2F0aW9uCiAgKiBAYWRl djogYW1kZ3B1IGRldmljZSBzdHJ1Y3R1cmUgaG9sZGluZyBhbGwgbmVjZXNzYXJ5IGluZm9ybWF0 aW9ucwogICogQG1jOiBtZW1vcnkgY29udHJvbGxlciBzdHJ1Y3R1cmUgaG9sZGluZyBtZW1vcnkg aW5mb3JtYXRpb25zCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfcmluZy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYwppbmRl eCA3NTE2NWUwLi5lZWExN2FlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfcmluZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9y aW5nLmMKQEAgLTIxMiwxMCArMjEyLDE5IEBAIGludCBhbWRncHVfcmluZ19pbml0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAKIAl9CiAKLQly ID0gYW1kZ3B1X3diX2dldChhZGV2LCAmcmluZy0+ZmVuY2Vfb2Zmcyk7Ci0JaWYgKHIpIHsKLQkJ ZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIHJpbmcgZmVuY2Vfb2ZmcyB3YiBhbGxvYyBmYWlsZWRc biIsIHIpOwotCQlyZXR1cm4gcjsKKwlpZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpICYmIHJpbmct PmZ1bmNzLT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVfR0ZYKSB7CisJCXIgPSBhbWRncHVfd2Jf Z2V0XzI1NkJpdChhZGV2LCAmcmluZy0+ZmVuY2Vfb2Zmcyk7CisJCWlmIChyKSB7CisJCQlkZXZf ZXJyKGFkZXYtPmRldiwgIiglZCkgcmluZyBmZW5jZV9vZmZzIHdiIGFsbG9jIGZhaWxlZFxuIiwg cik7CisJCQlyZXR1cm4gcjsKKwkJfQorCisJfSBlbHNlIHsKKwkJciA9IGFtZGdwdV93Yl9nZXQo YWRldiwgJnJpbmctPmZlbmNlX29mZnMpOworCQlpZiAocikgeworCQkJZGV2X2VycihhZGV2LT5k ZXYsICIoJWQpIHJpbmcgZmVuY2Vfb2ZmcyB3YiBhbGxvYyBmYWlsZWRcbiIsIHIpOworCQkJcmV0 dXJuIHI7CisJCX0KIAl9CiAKIAlyID0gYW1kZ3B1X3diX2dldChhZGV2LCAmcmluZy0+Y29uZF9l eGVfb2Zmcyk7CkBAIC0yNzgsMTcgKzI4NywxOCBAQCB2b2lkIGFtZGdwdV9yaW5nX2Zpbmkoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCXJpbmctPnJlYWR5ID0gZmFsc2U7CiAKIAlpZiAocmlu Zy0+ZnVuY3MtPnN1cHBvcnRfNjRiaXRfcHRycykgewotCQlhbWRncHVfd2JfZnJlZV82NGJpdChy aW5nLT5hZGV2LCByaW5nLT5jb25kX2V4ZV9vZmZzKTsKLQkJYW1kZ3B1X3diX2ZyZWVfNjRiaXQo cmluZy0+YWRldiwgcmluZy0+ZmVuY2Vfb2Zmcyk7CiAJCWFtZGdwdV93Yl9mcmVlXzY0Yml0KHJp bmctPmFkZXYsIHJpbmctPnJwdHJfb2Zmcyk7CiAJCWFtZGdwdV93Yl9mcmVlXzY0Yml0KHJpbmct PmFkZXYsIHJpbmctPndwdHJfb2Zmcyk7CiAJfSBlbHNlIHsKLQkJYW1kZ3B1X3diX2ZyZWUocmlu Zy0+YWRldiwgcmluZy0+Y29uZF9leGVfb2Zmcyk7Ci0JCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFk ZXYsIHJpbmctPmZlbmNlX29mZnMpOwogCQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5n LT5ycHRyX29mZnMpOwogCQlhbWRncHVfd2JfZnJlZShyaW5nLT5hZGV2LCByaW5nLT53cHRyX29m ZnMpOwogCX0KIAorCWFtZGdwdV93Yl9mcmVlKHJpbmctPmFkZXYsIHJpbmctPmNvbmRfZXhlX29m ZnMpOworCWlmIChhbWRncHVfc3Jpb3ZfdmYocmluZy0+YWRldikgJiYgcmluZy0+ZnVuY3MtPnR5 cGUgPT0gQU1ER1BVX1JJTkdfVFlQRV9HRlgpCisJCWFtZGdwdV93Yl9mcmVlXzI1NmJpdChyaW5n LT5hZGV2LCByaW5nLT5mZW5jZV9vZmZzKTsKKwllbHNlCisJCWFtZGdwdV93Yl9mcmVlKHJpbmct PmFkZXYsIHJpbmctPmNvbmRfZXhlX29mZnMpOwogCiAJYW1kZ3B1X2JvX2ZyZWVfa2VybmVsKCZy aW5nLT5yaW5nX29iaiwKIAkJCSAgICAgICZyaW5nLT5ncHVfYWRkciwKLS0gCjIuNy40CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK