From mboxrd@z Thu Jan 1 00:00:00 1970 From: Monk Liu Subject: [PATCH 9/9] drm/amdgpu:properly fix some JumpTable issues Date: Wed, 28 Sep 2016 16:36:20 +0800 Message-ID: <1475051780-21634-9-git-send-email-Monk.Liu@amd.com> References: <1475051780-21634-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: In-Reply-To: <1475051780-21634-1-git-send-email-Monk.Liu-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: Frank Min , Monk Liu d2UgZm91bmQgc29tZSBNRUMgdWNvZGUgbGVhZHMgdG8gSUIgdGVzdCBmYWlsIG9yIGV2ZW4Kcmlu ZyB0ZXN0IGZhaWwgaWYgSnVtcCBUYWJsZSBvZiBpdCBpcyBub3Qgc3RhcnQgaW4KRlcgYm8gd2l0 aCBwYWdlIGFsaWduZWQgYWRkcmVzcywgZml4ZWQgYnkgYWx3YXlzIG1ha2UKSlQgYWRkcmVzcyBw YWdlIGFsaWduZWQuCgp3ZSBkb24ndCBuZWVkIHRvIHBhdGNoIEpUMiBmb3IgTUVDMiwgYmVjYXVz ZSBmb3IgVkksCk1FQzIgaXMgYSBjb3B5IG9mIE1FQzEsIHRodXMgd2hlbiBjb252ZXJ0aW5nIGZ3 X3R5cGUKZm9yIE1FQ19KVDIgd2UganVzdCByZXR1cm4gTUVDMSxodyBjYW4gdXNlIHRoZSBzYW1l CkpUIGZvciBib3RoIE1FQzEgJiBNRUMyLgoKYWJvdmUgdHdvIGNoYW5nZSBmaXhlZCBzb21lIHJp bmcvaWIgdGVzdCBmYWlsdXJlIGlzc3VlCmZvciBzb21lIHZlcnNpb24gb2YgTUVDIHVjb2RlLgoK Q2hhbmdlLUlkOiBJZTNiM2M0YzU3MjJmZGY2OGY2NDU0N2NkZmJmOWMwZDMyNzRhMmExNQpTaWdu ZWQtb2ZmLWJ5OiBGcmFuayBNaW4gPEZyYW5rLk1pbkBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBN b25rIExpdSA8TW9uay5MaXVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfY2dzLmMgICB8IDIxICsrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdWNvZGUuYyB8IDMyICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY2dzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY2dzLmMKaW5kZXggY2IxYWRlMS4u NzI3ODg5OCAxMDA3NTUKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Nn cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jZ3MuYwpAQCAtNjg1 LDExICs2ODUsMTQgQEAgc3RhdGljIHVpbnQzMl90IGZ3X3R5cGVfY29udmVydChzdHJ1Y3QgY2dz X2RldmljZSAqY2dzX2RldmljZSwgdWludDMyX3QgZndfdHlwZSkKIAkJcmVzdWx0ID0gQU1ER1BV X1VDT0RFX0lEX0NQX01FQzE7CiAJCWJyZWFrOwogCWNhc2UgQ0dTX1VDT0RFX0lEX0NQX01FQ19K VDI6Ci0JCWlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9UT05HQSB8fCBhZGV2LT5hc2ljX3R5 cGUgPT0gQ0hJUF9QT0xBUklTMTEKLQkJICB8fCBhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9QT0xB UklTMTApCi0JCQlyZXN1bHQgPSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMjsKLQkJZWxzZQorCQkv KiBmb3IgVkkuIEpUMiBzaG91bGQgYmUgdGhlIHNhbWUgYXMgSlQxLCBiZWNhdXNlOgorCQkJMSwg TUVDMiBhbmQgTUVDMSB1c2UgZXhhY3RseSBzYW1lIEZXLgorCQkJMiwgSlQyIGlzIG5vdCBwYWNo ZWQgYnV0IEpUMSBpcy4KKwkJKi8KKwkJaWYgKGFkZXYtPmFzaWNfdHlwZSA+PSBDSElQX1RPUEFa KQogCQkJcmVzdWx0ID0gQU1ER1BVX1VDT0RFX0lEX0NQX01FQzE7CisJCWVsc2UKKwkJCXJlc3Vs dCA9IEFNREdQVV9VQ09ERV9JRF9DUF9NRUMyOwogCQlicmVhazsKIAljYXNlIENHU19VQ09ERV9J RF9STENfRzoKIAkJcmVzdWx0ID0gQU1ER1BVX1VDT0RFX0lEX1JMQ19HOwpAQCAtNzc5LDEyICs3 ODIsMTggQEAgc3RhdGljIGludCBhbWRncHVfY2dzX2dldF9maXJtd2FyZV9pbmZvKHN0cnVjdCBj Z3NfZGV2aWNlICpjZ3NfZGV2aWNlLAogCiAJCWlmICgodHlwZSA9PSBDR1NfVUNPREVfSURfQ1Bf TUVDX0pUMSkgfHwKIAkJICAgICh0eXBlID09IENHU19VQ09ERV9JRF9DUF9NRUNfSlQyKSkgewot CQkJZ3B1X2FkZHIgKz0gbGUzMl90b19jcHUoaGVhZGVyLT5qdF9vZmZzZXQpIDw8IDI7CisJCQln cHVfYWRkciArPSBBTElHTihsZTMyX3RvX2NwdShoZWFkZXItPmhlYWRlci51Y29kZV9zaXplX2J5 dGVzKSwgUEFHRV9TSVpFKTsKIAkJCWRhdGFfc2l6ZSA9IGxlMzJfdG9fY3B1KGhlYWRlci0+anRf c2l6ZSkgPDwgMjsKIAkJfQotCQlpbmZvLT5tY19hZGRyID0gZ3B1X2FkZHI7CisKKwkJaW5mby0+ a3B0ciA9IHVjb2RlLT5rYWRkcjsKIAkJaW5mby0+aW1hZ2Vfc2l6ZSA9IGRhdGFfc2l6ZTsKKwkJ aW5mby0+bWNfYWRkciA9IGdwdV9hZGRyOwogCQlpbmZvLT52ZXJzaW9uID0gKHVpbnQxNl90KWxl MzJfdG9fY3B1KGhlYWRlci0+aGVhZGVyLnVjb2RlX3ZlcnNpb24pOworCisJCWlmIChDR1NfVUNP REVfSURfQ1BfTUVDID09IHR5cGUpCisJCQlpbmZvLT5pbWFnZV9zaXplID0gKGhlYWRlci0+anRf b2Zmc2V0KSA8PCAyOworCiAJCWluZm8tPmZ3X3ZlcnNpb24gPSBhbWRncHVfZ2V0X2Zpcm13YXJl X3ZlcnNpb24oY2dzX2RldmljZSwgdHlwZSk7CiAJCWluZm8tPmZlYXR1cmVfdmVyc2lvbiA9ICh1 aW50MTZfdClsZTMyX3RvX2NwdShoZWFkZXItPnVjb2RlX2ZlYXR1cmVfdmVyc2lvbik7CiAJfSBl bHNlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29k ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2RlLmMKaW5kZXggMDZi YWFjOS4uZTJlYTJjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3Vjb2RlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2Rl LmMKQEAgLTIzOSw2ICsyMzksMzEgQEAgc3RhdGljIGludCBhbWRncHVfdWNvZGVfaW5pdF9zaW5n bGVfZncoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwKIAlyZXR1cm4gMDsKIH0K IAorc3RhdGljIGludCBhbWRncHVfdWNvZGVfcGF0Y2hfanQoc3RydWN0IGFtZGdwdV9maXJtd2Fy ZV9pbmZvICp1Y29kZSwKKwkJCQl1aW50NjRfdCBtY19hZGRyLCB2b2lkICprcHRyKQoreworCWNv bnN0IHN0cnVjdCBnZnhfZmlybXdhcmVfaGVhZGVyX3YxXzAgKmhlYWRlciA9IE5VTEw7CisJY29u c3Qgc3RydWN0IGNvbW1vbl9maXJtd2FyZV9oZWFkZXIgKmNvbW1faGRyID0gTlVMTDsKKwl1aW50 OF90KiBzcmNfYWRkciA9IE5VTEw7CisJdWludDhfdCogZHN0X2FkZHIgPSBOVUxMOworCisJaWYg KE5VTEwgPT0gdWNvZGUtPmZ3KQorCQlyZXR1cm4gMDsKKworCWNvbW1faGRyID0gKGNvbnN0IHN0 cnVjdCBjb21tb25fZmlybXdhcmVfaGVhZGVyICopdWNvZGUtPmZ3LT5kYXRhOworCWhlYWRlciA9 IChjb25zdCBzdHJ1Y3QgZ2Z4X2Zpcm13YXJlX2hlYWRlcl92MV8wICopdWNvZGUtPmZ3LT5kYXRh OworCWRzdF9hZGRyID0gdWNvZGUtPmthZGRyICsKKwkJCSAgIEFMSUdOKGxlMzJfdG9fY3B1KGNv bW1faGRyLT51Y29kZV9zaXplX2J5dGVzKSwKKwkJCSAgIFBBR0VfU0laRSk7CisJc3JjX2FkZHIg PSAodWludDhfdCAqKXVjb2RlLT5mdy0+ZGF0YSArCisJCQkgICBsZTMyX3RvX2NwdShjb21tX2hk ci0+dWNvZGVfYXJyYXlfb2Zmc2V0X2J5dGVzKSArCisJCQkgICAobGUzMl90b19jcHUoaGVhZGVy LT5qdF9vZmZzZXQpICogNCk7CisJbWVtY3B5KGRzdF9hZGRyLCBzcmNfYWRkciwgbGUzMl90b19j cHUoaGVhZGVyLT5qdF9zaXplKSAqIDQpOworCisJcmV0dXJuIDA7Cit9CisKKwogaW50IGFtZGdw dV91Y29kZV9pbml0X2JvKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXN0cnVjdCBh bWRncHVfYm8gKipibyA9ICZhZGV2LT5maXJtd2FyZS5md19idWY7CkBAIC0yODUsNiArMzEwLDEz IEBAIGludCBhbWRncHVfdWNvZGVfaW5pdF9ibyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAkJCWhlYWRlciA9IChjb25zdCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJlX2hlYWRlciAqKXVjb2Rl LT5mdy0+ZGF0YTsKIAkJCWFtZGdwdV91Y29kZV9pbml0X3NpbmdsZV9mdyh1Y29kZSwgZndfbWNf YWRkciArIGZ3X29mZnNldCwKIAkJCQkJCSAgICBmd19idWZfcHRyICsgZndfb2Zmc2V0KTsKKwkJ CWlmIChpID09IEFNREdQVV9VQ09ERV9JRF9DUF9NRUMxKSB7CisJCQkJY29uc3Qgc3RydWN0IGdm eF9maXJtd2FyZV9oZWFkZXJfdjFfMCAqY3BfaGRyOworCQkJCWNwX2hkciA9IChjb25zdCBzdHJ1 Y3QgZ2Z4X2Zpcm13YXJlX2hlYWRlcl92MV8wICopdWNvZGUtPmZ3LT5kYXRhOworCQkJCWFtZGdw dV91Y29kZV9wYXRjaF9qdCh1Y29kZSwgZndfbWNfYWRkciArIGZ3X29mZnNldCwKKwkJCQkJCSAg ICBmd19idWZfcHRyICsgZndfb2Zmc2V0KTsKKwkJCQlmd19vZmZzZXQgKz0gQUxJR04obGUzMl90 b19jcHUoY3BfaGRyLT5qdF9zaXplKSA8PCAyLCBQQUdFX1NJWkUpOworCQkJfQogCQkJZndfb2Zm c2V0ICs9IEFMSUdOKGxlMzJfdG9fY3B1KGhlYWRlci0+dWNvZGVfc2l6ZV9ieXRlcyksIFBBR0Vf U0laRSk7CiAJCX0KIAl9Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9hbWQtZ2Z4Cg==