From: Arun Siluvery Subject: [PATCH v2] drm/i915: Change SRM, LRM instructions to use correct length Date: Tue, 4 Aug 2015 16:22:20 +0100 Message-ID: <1438701740-32793-1-git-send-email-arun.siluvery@linux.intel.com> References: <1437059974-26575-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id A12616E3B2 for ; Tue, 4 Aug 2015 08:22:25 -0700 (PDT) In-Reply-To: <1437059974-26575-1-git-send-email-arun.siluvery@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org TUlfU1RPUkVfUkVHSVNURVJfTUVNLCBNSV9MT0FEX1JFR0lTVEVSX01FTSBpbnN0cnVjdGlvbnMg YXJlIG5vdCByZWFsbHkKdmFyaWFibGUgbGVuZ3RoIGluc3RydWN0aW9ucyB1bmxpa2UgTUlfTE9B RF9SRUdJU1RFUl9JTU0gd2hlcmUgaXQgZXhwZWN0cwoocmVnLCBhZGRyKSBwYWlycyBzbyB1c2Ug Zml4ZWQgbGVuZ3RoIGZvciB0aGVzZSBpbnN0cnVjdGlvbnMuCgp2MjogcmViYXNlCgpDYzogRGF2 ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBT aWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9jbWRfcGFyc2VyLmMgfCA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlZy5oICAgICAgICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyAgICAgICB8IDQgKystLQogNCBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAx MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Nt ZF9wYXJzZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCmluZGV4 IDQzMDU3MWIuLjM3NzE5MjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Y21kX3BhcnNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5j CkBAIC0xMjQsMTQgKzEyNCwxNCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9pOTE1X2NtZF9k ZXNjcmlwdG9yIGNvbW1vbl9jbWRzW10gPSB7CiAJQ01EKCAgTUlfU1RPUkVfRFdPUkRfSU5ERVgs ICAgICAgICAgICAgIFNNSSwgICAhRiwgIDB4RkYsICAgUiAgKSwKIAlDTUQoICBNSV9MT0FEX1JF R0lTVEVSX0lNTSgxKSwgICAgICAgICAgU01JLCAgICFGLCAgMHhGRiwgICBXLAogCSAgICAgIC5y ZWcgPSB7IC5vZmZzZXQgPSAxLCAubWFzayA9IDB4MDA3RkZGRkMsIC5zdGVwID0gMiB9ICAgICks Ci0JQ01EKCAgTUlfU1RPUkVfUkVHSVNURVJfTUVNKDEpLCAgICAgICAgIFNNSSwgICAhRiwgIDB4 RkYsICAgVyB8IEIsCisJQ01EKCAgTUlfU1RPUkVfUkVHSVNURVJfTUVNLCAgICAgICAgICAgIFNN SSwgICAgRiwgIDEsICAgICBXIHwgQiwKIAkgICAgICAucmVnID0geyAub2Zmc2V0ID0gMSwgLm1h c2sgPSAweDAwN0ZGRkZDIH0sCiAJICAgICAgLmJpdHMgPSB7ewogCQkJLm9mZnNldCA9IDAsCiAJ CQkubWFzayA9IE1JX0dMT0JBTF9HVFQsCiAJCQkuZXhwZWN0ZWQgPSAwLAogCSAgICAgIH19LAkJ CQkJCSAgICAgICApLAotCUNNRCggIE1JX0xPQURfUkVHSVNURVJfTUVNKDEpLCAgICAgICAgICAg ICBTTUksICAgIUYsICAweEZGLCAgIFcgfCBCLAorCUNNRCggIE1JX0xPQURfUkVHSVNURVJfTUVN LCAgICAgICAgICAgICBTTUksICAgIEYsICAxLCAgICAgVyB8IEIsCiAJICAgICAgLnJlZyA9IHsg Lm9mZnNldCA9IDEsIC5tYXNrID0gMHgwMDdGRkZGQyB9LAogCSAgICAgIC5iaXRzID0ge3sKIAkJ CS5vZmZzZXQgPSAwLApAQCAtMTAyMSw3ICsxMDIxLDcgQEAgc3RhdGljIGJvb2wgY2hlY2tfY21k KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkgKiBvbmx5IE1JX0xPQURf UkVHSVNURVJfSU1NIGNvbW1hbmRzLgogCQkJICovCiAJCQlpZiAocmVnX2FkZHIgPT0gT0FDT05U Uk9MKSB7Ci0JCQkJaWYgKGRlc2MtPmNtZC52YWx1ZSA9PSBNSV9MT0FEX1JFR0lTVEVSX01FTSgx KSkgeworCQkJCWlmIChkZXNjLT5jbWQudmFsdWUgPT0gTUlfTE9BRF9SRUdJU1RFUl9NRU0pIHsK IAkJCQkJRFJNX0RFQlVHX0RSSVZFUigiQ01EOiBSZWplY3RlZCBMUk0gdG8gT0FDT05UUk9MXG4i KTsKIAkJCQkJcmV0dXJuIGZhbHNlOwogCQkJCX0KQEAgLTEwMzUsNyArMTAzNSw3IEBAIHN0YXRp YyBib29sIGNoZWNrX2NtZChjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJ ICogYWxsb3dlZCBtYXNrL3ZhbHVlIHBhaXIgZ2l2ZW4gaW4gdGhlIHdoaXRlbGlzdCBlbnRyeS4K IAkJCSAqLwogCQkJaWYgKHJlZy0+bWFzaykgewotCQkJCWlmIChkZXNjLT5jbWQudmFsdWUgPT0g TUlfTE9BRF9SRUdJU1RFUl9NRU0oMSkpIHsKKwkJCQlpZiAoZGVzYy0+Y21kLnZhbHVlID09IE1J X0xPQURfUkVHSVNURVJfTUVNKSB7CiAJCQkJCURSTV9ERUJVR19EUklWRVIoIkNNRDogUmVqZWN0 ZWQgTFJNIHRvIG1hc2tlZCByZWdpc3RlciAweCUwOFhcbiIsCiAJCQkJCQkJIHJlZ19hZGRyKTsK IAkJCQkJcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggODI3NzE0Yy4u ZTFhODg3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC0zNDMsOCArMzQzLDggQEAKICAq LwogI2RlZmluZSBNSV9MT0FEX1JFR0lTVEVSX0lNTSh4KQlNSV9JTlNUUigweDIyLCAyKih4KS0x KQogI2RlZmluZSAgIE1JX0xSSV9GT1JDRV9QT1NURUQJCSgxPDwxMikKLSNkZWZpbmUgTUlfU1RP UkVfUkVHSVNURVJfTUVNKHgpIE1JX0lOU1RSKDB4MjQsIDIqKHgpLTEpCi0jZGVmaW5lIE1JX1NU T1JFX1JFR0lTVEVSX01FTV9HRU44KHgpIE1JX0lOU1RSKDB4MjQsIDMqKHgpLTEpCisjZGVmaW5l IE1JX1NUT1JFX1JFR0lTVEVSX01FTSAgICAgICAgTUlfSU5TVFIoMHgyNCwgMSkKKyNkZWZpbmUg TUlfU1RPUkVfUkVHSVNURVJfTUVNX0dFTjggICBNSV9JTlNUUigweDI0LCAyKQogI2RlZmluZSAg IE1JX1NSTV9MUk1fR0xPQkFMX0dUVAkJKDE8PDIyKQogI2RlZmluZSBNSV9GTFVTSF9EVwkJTUlf SU5TVFIoMHgyNiwgMSkgLyogZm9yIEdFTjYgKi8KICNkZWZpbmUgICBNSV9GTFVTSF9EV19TVE9S RV9JTkRFWAkoMTw8MjEpCkBAIC0zNTUsOCArMzU1LDggQEAKICNkZWZpbmUgICBNSV9JTlZBTElE QVRFX0JTRAkJKDE8PDcpCiAjZGVmaW5lICAgTUlfRkxVU0hfRFdfVVNFX0dUVAkJKDE8PDIpCiAj ZGVmaW5lICAgTUlfRkxVU0hfRFdfVVNFX1BQR1RUCQkoMDw8MikKLSNkZWZpbmUgTUlfTE9BRF9S RUdJU1RFUl9NRU0oeCkgTUlfSU5TVFIoMHgyOSwgMiooeCktMSkKLSNkZWZpbmUgTUlfTE9BRF9S RUdJU1RFUl9NRU1fR0VOOCh4KSBNSV9JTlNUUigweDI5LCAzKih4KS0xKQorI2RlZmluZSBNSV9M T0FEX1JFR0lTVEVSX01FTSAJICAgTUlfSU5TVFIoMHgyOSwgMSkKKyNkZWZpbmUgTUlfTE9BRF9S RUdJU1RFUl9NRU1fR0VOOCAgTUlfSU5TVFIoMHgyOSwgMikKICNkZWZpbmUgTUlfQkFUQ0hfQlVG RkVSCQlNSV9JTlNUUigweDMwLCAxKQogI2RlZmluZSAgIE1JX0JBVENIX05PTl9TRUNVUkUJCSgx KQogLyogZm9yIHNuYi9pdmIvdmx2IHRoaXMgYWxzbyBtZWFucyAiYmF0Y2ggaW4gcHBndHQiIHdo ZW4gcHBndHQgaXMgZW5hYmxlZC4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp bmRleCBhZjBiY2ZlLi5lOGYxYzk1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CkBAIC0xMTEyMywxMCArMTExMjMsMTAgQEAgc3RhdGljIGludCBpbnRlbF9nZW43X3F1ZXVlX2Zs aXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJREVSUk1SX1BJUEVCX1BSSV9GTElQX0RP TkUgfAogCQkJCQlERVJSTVJfUElQRUNfUFJJX0ZMSVBfRE9ORSkpOwogCQlpZiAoSVNfR0VOOChk ZXYpKQotCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1NUT1JFX1JFR0lTVEVSX01FTV9HRU44 KDEpIHwKKwkJCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9TVE9SRV9SRUdJU1RFUl9NRU1fR0VO OCB8CiAJCQkJCSAgICAgIE1JX1NSTV9MUk1fR0xPQkFMX0dUVCk7CiAJCWVsc2UKLQkJCWludGVs X3JpbmdfZW1pdChyaW5nLCBNSV9TVE9SRV9SRUdJU1RFUl9NRU0oMSkgfAorCQkJaW50ZWxfcmlu Z19lbWl0KHJpbmcsIE1JX1NUT1JFX1JFR0lTVEVSX01FTSB8CiAJCQkJCSAgICAgIE1JX1NSTV9M Uk1fR0xPQkFMX0dUVCk7CiAJCWludGVsX3JpbmdfZW1pdChyaW5nLCBERVJSTVIpOwogCQlpbnRl bF9yaW5nX2VtaXQocmluZywgcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMjU2KTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZDNhMDNmMy4uOTlhNzgyMCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKQEAgLTExMDYsNyArMTEwNiw3IEBAIHN0YXRpYyBpbmxpbmUgaW50IGdlbjhf ZW1pdF9mbHVzaF9jb2hlcmVudGwzX3dhKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJ aWYgKElTX1NLWUxBS0UocmluZy0+ZGV2KSAmJiBJTlRFTF9SRVZJRChyaW5nLT5kZXYpIDw9IFNL TF9SRVZJRF9FMCkKIAkJbDNzcWM0X2ZsdXNoIHw9IEdFTjhfTFFTQ19ST19QRVJGX0RJUzsKIAot CXdhX2N0eF9lbWl0KGJhdGNoLCBpbmRleCwgKE1JX1NUT1JFX1JFR0lTVEVSX01FTV9HRU44KDEp IHwKKwl3YV9jdHhfZW1pdChiYXRjaCwgaW5kZXgsIChNSV9TVE9SRV9SRUdJU1RFUl9NRU1fR0VO OCB8CiAJCQkJICAgTUlfU1JNX0xSTV9HTE9CQUxfR1RUKSk7CiAJd2FfY3R4X2VtaXQoYmF0Y2gs IGluZGV4LCBHRU44X0wzU1FDUkVHNCk7CiAJd2FfY3R4X2VtaXQoYmF0Y2gsIGluZGV4LCByaW5n LT5zY3JhdGNoLmd0dF9vZmZzZXQgKyAyNTYpOwpAQCAtMTEyNCw3ICsxMTI0LDcgQEAgc3RhdGlj IGlubGluZSBpbnQgZ2VuOF9lbWl0X2ZsdXNoX2NvaGVyZW50bDNfd2Eoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywKIAl3YV9jdHhfZW1pdChiYXRjaCwgaW5kZXgsIDApOwogCXdhX2N0eF9l bWl0KGJhdGNoLCBpbmRleCwgMCk7CiAKLQl3YV9jdHhfZW1pdChiYXRjaCwgaW5kZXgsIChNSV9M T0FEX1JFR0lTVEVSX01FTV9HRU44KDEpIHwKKwl3YV9jdHhfZW1pdChiYXRjaCwgaW5kZXgsIChN SV9MT0FEX1JFR0lTVEVSX01FTV9HRU44IHwKIAkJCQkgICBNSV9TUk1fTFJNX0dMT0JBTF9HVFQp KTsKIAl3YV9jdHhfZW1pdChiYXRjaCwgaW5kZXgsIEdFTjhfTDNTUUNSRUc0KTsKIAl3YV9jdHhf ZW1pdChiYXRjaCwgaW5kZXgsIHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCArIDI1Nik7Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK