From: Monk Liu Subject: [PATCH] drm/amdgpu:fix DMAframe for GFX8 Date: Wed, 24 Aug 2016 11:42:20 +0800 Message-ID: <1472010140-8571-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: Monk Liu MSxkcm9wIGluc2VydGluZyBkb3VibGUgU1dJVENIX0JVRkZFUlMgc2NoZW1lLCB3aGljaCBpbXBh Y3RzCnBlcmZvcm1hbmNlLCBiZWNhdXNlIGRvdWJsZSBTV0lUQ0hfQlVGRkVSIGFjdGF1bGx5IGRv ZXNuJ3QKc3dpdGNoIGJ1ZmZlciwgc28gdGhlIENFJ3MgcGluZy1wb25nIGJ1ZmZlciBpcyBub3Qg dXNlZCBhdAphbGwuIE5vdyBvbmx5IGluc2VydCBvbmUgU1dJVENIX0JVRkZFUlMgYXQgdGhlIGJv dHRvbSBvZgplYWNoIEdGWCBkbWFmcmFtZS4gQW5kIG9ubHkgaW5zZXJ0aW5nIG9uZSBTV0lUQ0hf QlVGRkVSIGlzCmEgbXVzdCBmb3IgVmlydHVhbGl6YXRpb24gV29ybGQgU3dpdGNoIQoKMix3aXRo b3V0IGRvdWJsZSBTV0lUQ0hfQlVGRlJFUywgQ0Ugd2lsbCBnbyB2ZXJ5IGFoZWFkCm9mIERFIHdo aWNoIHdpbGwgdHJpZ2dlciBWTSBmYXVsdCAoQ0UgSUIgcnVuIGJlZm9yZSBERQpmaW5pc2hlZCBW TSBmbHVzaCksIHNvIHdlIG5lZWQgYSB3YXkgdG8gcHJldmVudCB0aGF0IGhhcHBlbi4KYWNjb3Jk aW5nIHRvIEdGWDguMCBzcGVjLCBDRSB3aWxsIGdvIGFoZWFkIG9mIERFIGF0IG1vc3QgYnkKMTI4 ZHcsIHNvIHdlIGNhbiBpbnNlcnQgMTI4IE5PUCBiZWZvcmUgQ0UgaWIsIHNvIHRoYXQKQ0Ugd29u J3QgcnVuIGNvbnN0IElCIGJlZm9yZSBERSBmaW5pc2hlZCBWTSBmbHVzaC4KCjMsZm9yIHZpcnR1 YWxpemF0aW9uLCBDUCByZXF1aXJlcyB0aGF0IGVhY2ggRE1BZnJhbWUgbmVlZAp0d28gY29uc3Qg SUIgYW5kIG9uZSBJQiwgc28gd2UgY2Fubm90IHJlbW92ZSBwcmVhbWJsZSBDRSBJQgpldmVuIG5v IGNvbnRleHQgc3dpdGNoIHRha2UgcGxhY2UuCgo0LGVhY2ggRE1BZnJhbWUgd29uJ3Qgb2NjdXB5 IG1vcmUgdGhhbiAyNTZkdywgc28gYWxsb2NhdGUKMjU2ZHcgaXMgZW5vdWdoCgpUT0RPOgp1c2Ug RE1BZnJhbWUgZW50cnkgZGVzaWduIHRvIGltcGxlbWVudCBpYl9zY2hlZHVsZSgpLCBtYWtlIHN1 cmUKZWFjaCBETUFmcmFtZSBpcyBhbGlnbmVkIGFuZCBmaXhlZCBhdCB0aGVpciBvZmZzZXQsIHdo aWNoIGlzCm5lZWRlZCBmb3IgcHJlZW1wdGlvbiBhbmQgZWFzeSBmb3IgcmluZyBidWZmZXIgZGVi dWcgJiBkdW1wLgoKQ2hhbmdlLUlkOiBJMWI5OGQ2MzUyYjdlYWQ5MWI2NjEwOTQ5MjFiZmQ0M2Nm ZWFhZTE5MApTaWduZWQtb2ZmLWJ5OiBNb25rIExpdSA8TW9uay5MaXVAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICB8ICAyICsrCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaWIuYyB8IDE1ICsrKysrKysrKystLS0tLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyAgfCAyNyArKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCAzMTZiZDJhLi4xMWJiMDVm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMzM3LDYgKzMzNyw3IEBAIHN0 cnVjdCBhbWRncHVfcmluZ19mdW5jcyB7CiAJdm9pZCAoKmVuZF91c2UpKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZyk7CiAJdm9pZCAoKmVtaXRfd3JlZykgKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZywgdWludDMyX3Qgb2Zmc2V0LCB1aW50MzJfdCB2YWwpOwogCXZvaWQgKCplbWl0X3JyZWcpIChz dHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVpbnQzMl90IG9mZnNldCk7CisJdm9pZCAoKmVtaXRf c2IpIChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIGludCBjbnQpOwogfTsKIAogLyoKQEAgLTIz NzAsNiArMjM3MSw3IEBAIGFtZGdwdV9nZXRfc2RtYV9pbnN0YW5jZShzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKnJpbmcpCiAjZGVmaW5lIGFtZGdwdV9yaW5nX2VtaXRfaGRwX2ludmFsaWRhdGUocikgKHIp LT5mdW5jcy0+ZW1pdF9oZHBfaW52YWxpZGF0ZSgocikpCiAjZGVmaW5lIGFtZGdwdV9yaW5nX2Vt aXRfd3JlZyhyLCBpLCB2KSAociktPmZ1bmNzLT5lbWl0X3dyZWcoKHIpLCAoaSksICh2KSkKICNk ZWZpbmUgYW1kZ3B1X3JpbmdfZW1pdF9ycmVnKHIsIGkpIChyKS0+ZnVuY3MtPmVtaXRfcnJlZygo ciksIChpKSkKKyNkZWZpbmUgYW1kZ3B1X3JpbmdfZW1pdF9zYihyLCBjKSAociktPmZ1bmNzLT5l bWl0X3NiKChyKSwgKGMpKQogI2RlZmluZSBhbWRncHVfcmluZ19wYWRfaWIociwgaWIpICgocikt PmZ1bmNzLT5wYWRfaWIoKHIpLCAoaWIpKSkKICNkZWZpbmUgYW1kZ3B1X3JpbmdfaW5pdF9jb25k X2V4ZWMocikgKHIpLT5mdW5jcy0+aW5pdF9jb25kX2V4ZWMoKHIpKQogI2RlZmluZSBhbWRncHVf cmluZ19wYXRjaF9jb25kX2V4ZWMocixvKSAociktPmZ1bmNzLT5wYXRjaF9jb25kX2V4ZWMoKHIp LChvKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pYi5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2liLmMKaW5kZXggYTMxZDdlZi4u ZDk5YWYwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2li LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2liLmMKQEAgLTE1MSw3 ICsxNTEsNyBAQCBpbnQgYW1kZ3B1X2liX3NjaGVkdWxlKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZywgdW5zaWduZWQgbnVtX2licywKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JciA9IGFtZGdw dV9yaW5nX2FsbG9jKHJpbmcsIDI1NiAqIG51bV9pYnMpOworCXIgPSBhbWRncHVfcmluZ19hbGxv YyhyaW5nLCAyNTYpOwogCWlmIChyKSB7CiAJCWRldl9lcnIoYWRldi0+ZGV2LCAic2NoZWR1bGlu ZyBJQiBmYWlsZWQgKCVkKS5cbiIsIHIpOwogCQlyZXR1cm4gcjsKQEAgLTE3NCwxNSArMTc0LDE2 IEBAIGludCBhbWRncHVfaWJfc2NoZWR1bGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1bnNp Z25lZCBudW1faWJzLAogCS8qIGFsd2F5cyBzZXQgY29uZF9leGVjX3BvbGxpbmcgdG8gQ09OVElO VUUgKi8KIAkqcmluZy0+Y29uZF9leGVfY3B1X2FkZHIgPSAxOwogCisKKwkvKiBlbWl0IDEyOCBk dyBub3AgYmVmb3JlIElCYyAqLworCWlmIChyaW5nLT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVf R0ZYKQorCQlhbWRncHVfcmluZ19pbnNlcnRfbm9wKHJpbmcsIDEyOCk7CisKIAlza2lwX3ByZWFt YmxlID0gcmluZy0+Y3VycmVudF9jdHggPT0gY3R4OwogCW5lZWRfY3R4X3N3aXRjaCA9IHJpbmct PmN1cnJlbnRfY3R4ICE9IGN0eDsKIAlmb3IgKGkgPSAwOyBpIDwgbnVtX2liczsgKytpKSB7CiAJ CWliID0gJmlic1tpXTsKIAotCQkvKiBkcm9wIHByZWFtYmxlIElCcyBpZiB3ZSBkb24ndCBoYXZl IGEgY29udGV4dCBzd2l0Y2ggKi8KLQkJaWYgKChpYi0+ZmxhZ3MgJiBBTURHUFVfSUJfRkxBR19Q UkVBTUJMRSkgJiYgc2tpcF9wcmVhbWJsZSkKLQkJCWNvbnRpbnVlOwotCiAJCWFtZGdwdV9yaW5n X2VtaXRfaWIocmluZywgaWIsIGpvYiA/IGpvYi0+dm1faWQgOiAwLAogCQkJCSAgICBuZWVkX2N0 eF9zd2l0Y2gpOwogCQluZWVkX2N0eF9zd2l0Y2ggPSBmYWxzZTsKQEAgLTIxMCw2ICsyMTEsMTAg QEAgaW50IGFtZGdwdV9pYl9zY2hlZHVsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVuc2ln bmVkIG51bV9pYnMsCiAJCWFtZGdwdV9yaW5nX3BhdGNoX2NvbmRfZXhlYyhyaW5nLCBwYXRjaF9v ZmZzZXQpOwogCiAJcmluZy0+Y3VycmVudF9jdHggPSBjdHg7CisKKwkvKiBJbnNlcnQgb25lIFNC IGF0IHRoZSBib3R0b20gb2YgZWFjaCBETUEgZnJhbWUgKi8KKwlpZiAocmluZy0+ZnVuY3MtPmVt aXRfc2IpCisJCWFtZGdwdV9yaW5nX2VtaXRfc2IocmluZywgMSk7CiAJYW1kZ3B1X3JpbmdfY29t bWl0KHJpbmcpOwogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8w LmMKaW5kZXggZGZhMjI4OC4uMzdkYzY0YiAxMDA3NTUKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhf djhfMC5jCkBAIC01OTM2LDEyICs1OTM2LDYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfcmluZ19l bWl0X2liX2dmeChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiB7CiAJdTMyIGhlYWRlciwgY29u dHJvbCA9IDA7CiAKLQkvKiBpbnNlcnQgU1dJVENIX0JVRkZFUiBwYWNrZXQgYmVmb3JlIGZpcnN0 IElCIGluIHRoZSByaW5nIGZyYW1lICovCi0JaWYgKGN0eF9zd2l0Y2gpIHsKLQkJYW1kZ3B1X3Jp bmdfd3JpdGUocmluZywgUEFDS0VUMyhQQUNLRVQzX1NXSVRDSF9CVUZGRVIsIDApKTsKLQkJYW1k Z3B1X3Jpbmdfd3JpdGUocmluZywgMCk7Ci0JfQotCiAJaWYgKGliLT5mbGFncyAmIEFNREdQVV9J Ql9GTEFHX0NFKQogCQloZWFkZXIgPSBQQUNLRVQzKFBBQ0tFVDNfSU5ESVJFQ1RfQlVGRkVSX0NP TlNULCAyKTsKIAllbHNlCkBAIC02MDEzLDExICs2MDA3LDkgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4 XzBfcmluZ19lbWl0X3BpcGVsaW5lX3N5bmMoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCWFt ZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDQpOyAvKiBwb2xsIGludGVydmFsICovCiAKIAlpZiAodXNl cGZwKSB7Ci0JCS8qIHN5bmNlIENFIHdpdGggTUUgdG8gcHJldmVudCBDRSBmZXRjaCBDRUlCIGJl Zm9yZSBjb250ZXh0IHN3aXRjaCBkb25lICovCi0JCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFBB Q0tFVDMoUEFDS0VUM19TV0lUQ0hfQlVGRkVSLCAwKSk7Ci0JCWFtZGdwdV9yaW5nX3dyaXRlKHJp bmcsIDApOwotCQlhbWRncHVfcmluZ193cml0ZShyaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU1dJVENI X0JVRkZFUiwgMCkpOwotCQlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsKKwkJLyogc3luYyBQ RlAgdG8gTUUsIG90aGVyd2lzZSB3ZSBtaWdodCBnZXQgaW52YWxpZCBQRlAgcmVhZHMgKi8KKwkJ YW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgUEFDS0VUMyhQQUNLRVQzX1BGUF9TWU5DX01FLCAwKSk7 CisJCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDB4MCk7CiAJfQogfQogCkBAIC02MDY1LDEwICs2 MDU3LDYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfcmluZ19lbWl0X3ZtX2ZsdXNoKHN0cnVjdCBh bWRncHVfcmluZyAqcmluZywKIAkJLyogc3luYyBQRlAgdG8gTUUsIG90aGVyd2lzZSB3ZSBtaWdo dCBnZXQgaW52YWxpZCBQRlAgcmVhZHMgKi8KIAkJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgUEFD S0VUMyhQQUNLRVQzX1BGUF9TWU5DX01FLCAwKSk7CiAJCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcs IDB4MCk7Ci0JCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFBBQ0tFVDMoUEFDS0VUM19TV0lUQ0hf QlVGRkVSLCAwKSk7Ci0JCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDApOwotCQlhbWRncHVfcmlu Z193cml0ZShyaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU1dJVENIX0JVRkZFUiwgMCkpOwotCQlhbWRn cHVfcmluZ193cml0ZShyaW5nLCAwKTsKIAl9CiB9CiAKQEAgLTYxNzAsNiArNjE1OCwxNCBAQCBz dGF0aWMgdm9pZCBnZnhfdjhfMF9yaW5nX2VtaXRfd3JlZ19raXEoc3RydWN0IGFtZGdwdV9yaW5n ICpyaW5nLCB1MzIgaWR4LCB1MzIgdgogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIHZhbCk7CiB9 CiAKK3N0YXRpYyB2b2lkIGdmeF92OF9yaW5nX2VtaXRfc2Ioc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nLCBpbnQgY250KQoreworCXdoaWxlIChjbnQtLSkgeworCQlhbWRncHVfcmluZ193cml0ZShy aW5nLCBQQUNLRVQzKFBBQ0tFVDNfU1dJVENIX0JVRkZFUiwgMCkpOworCQlhbWRncHVfcmluZ193 cml0ZShyaW5nLCAwKTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIGdmeF92OF8wX3NldF9nZnhfZW9w X2ludGVycnVwdF9zdGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkJCSBlbnVt IGFtZGdwdV9pbnRlcnJ1cHRfc3RhdGUgc3RhdGUpCiB7CkBAIC02NDc3LDYgKzY0NzMsNyBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIGdmeF92OF8wX3JpbmdfZnVuY3Nf Z2Z4ID0gewogCS50ZXN0X2liID0gZ2Z4X3Y4XzBfcmluZ190ZXN0X2liLAogCS5pbnNlcnRfbm9w ID0gYW1kZ3B1X3JpbmdfaW5zZXJ0X25vcCwKIAkucGFkX2liID0gYW1kZ3B1X3JpbmdfZ2VuZXJp Y19wYWRfaWIsCisJLmVtaXRfc2IgPSBnZnhfdjhfcmluZ19lbWl0X3NiLAogfTsKIAogc3RhdGlj IGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhfdjhfMF9yaW5nX2Z1bmNzX2NvbXB1 dGUgPSB7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==