From: Rex Zhu Subject: [PATCH 2/2] drm/amdgpu: fix program vce instance logic error. Date: Wed, 11 Jan 2017 11:48:39 +0800 Message-ID: <1484106519-10827-2-git-send-email-Rex.Zhu@amd.com> References: <1484106519-10827-1-git-send-email-Rex.Zhu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1484106519-10827-1-git-send-email-Rex.Zhu-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: Rex Zhu bmVlZCB0byBjbGVhciBiaXQzMS0yOSBpbiBHUkJNX0dGWF9JTkRFWCwKdGhlbiB0aGUgcHJvZ3Jh bSBjYW4gYmUgdmFsaWQuCgpDaGFuZ2UtSWQ6IEk2ZjU5YjRmZDUzYjRhMWVhMDBjNjAxMzk5MjRj ZmFmZmQwY2ZlOTY4ClNpZ25lZC1vZmYtYnk6IFJleCBaaHUgPFJleC5aaHVAYW1kLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjNfMC5jIHwgMjUgKysrKysrKysrKysr KysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92M18wLmMKaW5kZXggMGFjNDk4My4u OGRiMjY1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjNfMC5jCkBAIC00Myw5ICs0 MywxMyBAQAogCiAjZGVmaW5lIEdSQk1fR0ZYX0lOREVYX19WQ0VfSU5TVEFOQ0VfX1NISUZUCTB4 MDQKICNkZWZpbmUgR1JCTV9HRlhfSU5ERVhfX1ZDRV9JTlNUQU5DRV9NQVNLCTB4MTAKKyNkZWZp bmUgR1JCTV9HRlhfSU5ERVhfX1ZDRV9BTExfUElQRQkJMHgwNworCiAjZGVmaW5lIG1tVkNFX0xN SV9WQ1BVX0NBQ0hFXzQwQklUX0JBUjAJMHg4NjE2CiAjZGVmaW5lIG1tVkNFX0xNSV9WQ1BVX0NB Q0hFXzQwQklUX0JBUjEJMHg4NjE3CiAjZGVmaW5lIG1tVkNFX0xNSV9WQ1BVX0NBQ0hFXzQwQklU X0JBUjIJMHg4NjE4CisjZGVmaW5lIG1tR1JCTV9HRlhfSU5ERVhfREVGQVVMVCAweEUwMDAwMDAw CisKICNkZWZpbmUgVkNFX1NUQVRVU19WQ1BVX1JFUE9SVF9GV19MT0FERURfTUFTSwkweDAyCiAK ICNkZWZpbmUgVkNFX1YzXzBfRldfU0laRQkoMzg0ICogMTAyNCkKQEAgLTU0LDYgKzU4LDkgQEAK IAogI2RlZmluZSBGV181Ml84XzMJKCg1MiA8PCAyNCkgfCAoOCA8PCAxNikgfCAoMyA8PCA4KSkK IAorI2RlZmluZSBHRVRfVkNFX0lOU1RBTkNFKGkpICAoKGkpIDw8IEdSQk1fR0ZYX0lOREVYX19W Q0VfSU5TVEFOQ0VfX1NISUZUIFwKKwkJCQkJfCBHUkJNX0dGWF9JTkRFWF9fVkNFX0FMTF9QSVBF KQorCiBzdGF0aWMgdm9pZCB2Y2VfdjNfMF9tY19yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsIGludCBpZHgpOwogc3RhdGljIHZvaWQgdmNlX3YzXzBfc2V0X3JpbmdfZnVuY3Moc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogc3RhdGljIHZvaWQgdmNlX3YzXzBfc2V0X2lycV9m dW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CkBAIC0yNTMsNyArMjYwLDcgQEAgc3Rh dGljIGludCB2Y2VfdjNfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJaWYg KGFkZXYtPnZjZS5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGlkeCkpCiAJCQljb250aW51ZTsKIAot CQlXUkVHMzJfRklFTEQoR1JCTV9HRlhfSU5ERVgsIFZDRV9JTlNUQU5DRSwgaWR4KTsKKwkJV1JF RzMyKG1tR1JCTV9HRlhfSU5ERVgsIEdFVF9WQ0VfSU5TVEFOQ0UoaWR4KSk7CiAJCXZjZV92M18w X21jX3Jlc3VtZShhZGV2LCBpZHgpOwogCQlXUkVHMzJfRklFTEQoVkNFX1NUQVRVUywgSk9CX0JV U1ksIDEpOwogCkBAIC0yNzcsNyArMjg0LDcgQEAgc3RhdGljIGludCB2Y2VfdjNfMF9zdGFydChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJfQogCX0KIAotCVdSRUczMl9GSUVMRChHUkJN X0dGWF9JTkRFWCwgVkNFX0lOU1RBTkNFLCAwKTsKKwlXUkVHMzIobW1HUkJNX0dGWF9JTkRFWCwg bW1HUkJNX0dGWF9JTkRFWF9ERUZBVUxUKTsKIAltdXRleF91bmxvY2soJmFkZXYtPmdyYm1faWR4 X211dGV4KTsKIAogCXJldHVybiAwOwpAQCAtMjkyLDcgKzI5OSw3IEBAIHN0YXRpYyBpbnQgdmNl X3YzXzBfc3RvcChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJaWYgKGFkZXYtPnZjZS5o YXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGlkeCkpCiAJCQljb250aW51ZTsKIAotCQlXUkVHMzJfRklF TEQoR1JCTV9HRlhfSU5ERVgsIFZDRV9JTlNUQU5DRSwgaWR4KTsKKwkJV1JFRzMyKG1tR1JCTV9H RlhfSU5ERVgsIEdFVF9WQ0VfSU5TVEFOQ0UoaWR4KSk7CiAKIAkJaWYgKGFkZXYtPmFzaWNfdHlw ZSA+PSBDSElQX1NUT05FWSkKIAkJCVdSRUczMl9QKG1tVkNFX1ZDUFVfQ05UTCwgMCwgfjB4MjAw MDAxKTsKQEAgLTMxMCw3ICszMTcsNyBAQCBzdGF0aWMgaW50IHZjZV92M18wX3N0b3Aoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQl2Y2VfdjNfMF9zZXRfdmNlX3N3X2Nsb2NrX2dhdGlu ZyhhZGV2LCBmYWxzZSk7CiAJfQogCi0JV1JFRzMyX0ZJRUxEKEdSQk1fR0ZYX0lOREVYLCBWQ0Vf SU5TVEFOQ0UsIDApOworCVdSRUczMihtbUdSQk1fR0ZYX0lOREVYLCBtbUdSQk1fR0ZYX0lOREVY X0RFRkFVTFQpOwogCW11dGV4X3VubG9jaygmYWRldi0+Z3JibV9pZHhfbXV0ZXgpOwogCiAJcmV0 dXJuIDA7CkBAIC01OTAsMTcgKzU5NywxNyBAQCBzdGF0aWMgYm9vbCB2Y2VfdjNfMF9jaGVja19z b2Z0X3Jlc2V0KHZvaWQgKmhhbmRsZSkKIAkgKiBWQ0UgdGVhbSBzdWdnZXN0IHVzZSBiaXQgMy0t Yml0IDYgZm9yIGJ1c3kgc3RhdHVzIGNoZWNrCiAJICovCiAJbXV0ZXhfbG9jaygmYWRldi0+Z3Ji bV9pZHhfbXV0ZXgpOwotCVdSRUczMl9GSUVMRChHUkJNX0dGWF9JTkRFWCwgSU5TVEFOQ0VfSU5E RVgsIDApOworCVdSRUczMihtbUdSQk1fR0ZYX0lOREVYLCBHRVRfVkNFX0lOU1RBTkNFKDApKTsK IAlpZiAoUlJFRzMyKG1tVkNFX1NUQVRVUykgJiBBTURHUFVfVkNFX1NUQVRVU19CVVNZX01BU0sp IHsKIAkJc3JibV9zb2Z0X3Jlc2V0ID0gUkVHX1NFVF9GSUVMRChzcmJtX3NvZnRfcmVzZXQsIFNS Qk1fU09GVF9SRVNFVCwgU09GVF9SRVNFVF9WQ0UwLCAxKTsKIAkJc3JibV9zb2Z0X3Jlc2V0ID0g UkVHX1NFVF9GSUVMRChzcmJtX3NvZnRfcmVzZXQsIFNSQk1fU09GVF9SRVNFVCwgU09GVF9SRVNF VF9WQ0UxLCAxKTsKIAl9Ci0JV1JFRzMyX0ZJRUxEKEdSQk1fR0ZYX0lOREVYLCBJTlNUQU5DRV9J TkRFWCwgMHgxMCk7CisJV1JFRzMyKG1tR1JCTV9HRlhfSU5ERVgsIEdFVF9WQ0VfSU5TVEFOQ0Uo MSkpOwogCWlmIChSUkVHMzIobW1WQ0VfU1RBVFVTKSAmIEFNREdQVV9WQ0VfU1RBVFVTX0JVU1lf TUFTSykgewogCQlzcmJtX3NvZnRfcmVzZXQgPSBSRUdfU0VUX0ZJRUxEKHNyYm1fc29mdF9yZXNl dCwgU1JCTV9TT0ZUX1JFU0VULCBTT0ZUX1JFU0VUX1ZDRTAsIDEpOwogCQlzcmJtX3NvZnRfcmVz ZXQgPSBSRUdfU0VUX0ZJRUxEKHNyYm1fc29mdF9yZXNldCwgU1JCTV9TT0ZUX1JFU0VULCBTT0ZU X1JFU0VUX1ZDRTEsIDEpOwogCX0KLQlXUkVHMzJfRklFTEQoR1JCTV9HRlhfSU5ERVgsIElOU1RB TkNFX0lOREVYLCAwKTsKKwlXUkVHMzIobW1HUkJNX0dGWF9JTkRFWCwgR0VUX1ZDRV9JTlNUQU5D RSgwKSk7CiAJbXV0ZXhfdW5sb2NrKCZhZGV2LT5ncmJtX2lkeF9tdXRleCk7CiAKIAlpZiAoc3Ji bV9zb2Z0X3Jlc2V0KSB7CkBAIC03MjEsNyArNzI4LDcgQEAgc3RhdGljIGludCB2Y2VfdjNfMF9z ZXRfY2xvY2tnYXRpbmdfc3RhdGUodm9pZCAqaGFuZGxlLAogCQlpZiAoYWRldi0+dmNlLmhhcnZl c3RfY29uZmlnICYgKDEgPDwgaSkpCiAJCQljb250aW51ZTsKIAotCQlXUkVHMzJfRklFTEQoR1JC TV9HRlhfSU5ERVgsIFZDRV9JTlNUQU5DRSwgaSk7CisJCVdSRUczMihtbUdSQk1fR0ZYX0lOREVY LCBHRVRfVkNFX0lOU1RBTkNFKGkpKTsKIAogCQlpZiAoZW5hYmxlKSB7CiAJCQkvKiBpbml0aWFs aXplIFZDRV9DTE9DS19HQVRJTkdfQTogQ2xvY2sgT04vT0ZGIGRlbGF5ICovCkBAIC03NDAsNyAr NzQ3LDcgQEAgc3RhdGljIGludCB2Y2VfdjNfMF9zZXRfY2xvY2tnYXRpbmdfc3RhdGUodm9pZCAq aGFuZGxlLAogCQl2Y2VfdjNfMF9zZXRfdmNlX3N3X2Nsb2NrX2dhdGluZyhhZGV2LCBlbmFibGUp OwogCX0KIAotCVdSRUczMl9GSUVMRChHUkJNX0dGWF9JTkRFWCwgVkNFX0lOU1RBTkNFLCAwKTsK KwlXUkVHMzIobW1HUkJNX0dGWF9JTkRFWCwgbW1HUkJNX0dGWF9JTkRFWF9ERUZBVUxUKTsKIAlt dXRleF91bmxvY2soJmFkZXYtPmdyYm1faWR4X211dGV4KTsKIAogCXJldHVybiAwOwotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=