From: Michel Thierry Subject: [PATCH v5 16/18] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+ Date: Fri, 24 Mar 2017 18:30:08 -0700 Message-ID: <20170325013010.36244-17-michel.thierry@intel.com> References: <20170325013010.36244-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id B92016E257 for ; Sat, 25 Mar 2017 01:30:12 +0000 (UTC) In-Reply-To: <20170325013010.36244-1-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org RW1pdCB0aGUgcmVxdWlyZWQgY29tbWFuZHMgaW50byB0aGUgcmluZyBidWZmZXIgZm9yIHN0YXJ0 aW5nIGFuZApzdG9wcGluZyB0aGUgd2F0Y2hkb2cgdGltZXIgYmVmb3JlL2FmdGVyIGJhdGNoIGJ1 ZmZlciBzdGFydCBkdXJpbmcKYmF0Y2ggYnVmZmVyIHN1Ym1pc3Npb24uCgp2MjogU3VwcG9ydCB3 YXRjaGRvZyB0aHJlc2hvbGQgcGVyIGNvbnRleHQgZW5naW5lLCBtZXJnZSBscmkgY29tbWFuZHMs CmFuZCBtb3ZlIHdhdGNoZG9nIGNvbW1hbmRzIGVtaXNzaW9uIHRvIGVtaXRfYmJfc3RhcnQuIFJl cXVlc3Qgc3BhY2Ugb2YKY29tYmluZWQgc3RhcnRfd2F0Y2hkb2csIGJiX3N0YXJ0IGFuZCBzdG9w X3dhdGNoZG9nIHRvIGF2b2lkIGFueSBlcnJvcgphZnRlciBlbWl0dGluZyBiYl9zdGFydC4KClNp Z25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KU2lnbmVkLW9mZi1i eTogSWFuIExpc3RlciA8aWFuLmxpc3RlckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4g U2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBN aWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaCB8ICA0ICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyAgICAgICAgfCA4NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA0ICsrCiAzIGZp bGVzIGNoYW5nZWQsIDkyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCmluZGV4IDRhZjJhYjk0NTU4Yi4uODg3MDBiZGJi NGUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCkBAIC0xNTAsNiAr MTUwLDEwIEBAIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0IHsKIAkJdTMyICpscmNfcmVnX3N0YXRl OwogCQl1NjQgbHJjX2Rlc2M7CiAJCWludCBwaW5fY291bnQ7CisJCS8qKiB3YXRjaGRvZ190aHJl c2hvbGQ6IGh3IHdhdGNoZG9nIHRocmVzaG9sZCB2YWx1ZSwKKwkJICogaW4gY2xvY2sgY291bnRz CisJCSAqLworCQl1MzIgd2F0Y2hkb2dfdGhyZXNob2xkOwogCQlib29sIGluaXRpYWxpc2VkOwog CX0gZW5naW5lW0k5MTVfTlVNX0VOR0lORVNdOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IDczZjhmYmRjZjFmYi4uMjczNmY2NDJkYzc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwpAQCAtMTMxOSw2ICsxMzE5LDggQEAgc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkgICAgICBjb25zdCB1bnNpZ25lZCBp bnQgZmxhZ3MpCiB7CiAJdTMyICpjczsKKwl1MzIgbnVtX2R3b3JkczsKKwlib29sIHdhdGNoZG9n X3J1bm5pbmcgPSBmYWxzZTsKIAlpbnQgcmV0OwogCiAJLyogRG9uJ3QgcmVseSBpbiBodyB1cGRh dGluZyBQRFBzLCBzcGVjaWFsbHkgaW4gbGl0ZS1yZXN0b3JlLgpAQCAtMTMzOCwxMCArMTM0MCwy OSBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKIAkJcmVxLT5jdHgtPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyAmPSB+aW50ZWxf ZW5naW5lX2ZsYWcocmVxLT5lbmdpbmUpOwogCX0KIAotCWNzID0gaW50ZWxfcmluZ19iZWdpbihy ZXEsIDQpOworCS8qIGJiX3N0YXJ0IG9ubHkgKi8KKwludW1fZHdvcmRzID0gNDsKKworCS8qIGNo ZWNrIGlmIHdhdGNoZG9nIHdpbGwgYmUgcmVxdWlyZWQgKi8KKwlpZiAocmVxLT5jdHgtPmVuZ2lu ZVtyZXEtPmVuZ2luZS0+aWRdLndhdGNoZG9nX3RocmVzaG9sZCAhPSAwKSB7CisJCWlmICghcmVx LT5lbmdpbmUtPmVtaXRfc3RhcnRfd2F0Y2hkb2cgfHwKKwkJICAgICFyZXEtPmVuZ2luZS0+ZW1p dF9zdG9wX3dhdGNoZG9nKQorCQkJcmV0dXJuIC1FSU5WQUw7CisKKwkJLyogc3RhcnRfd2F0Y2hk b2cgKDYpICsgYmJfc3RhcnQgKDQpICsgc3RvcF93YXRjaGRvZyAoNCkgKi8KKwkJbnVtX2R3b3Jk cyArPSAxMDsKKwkJd2F0Y2hkb2dfcnVubmluZyA9IHRydWU7CisJfQorCisJY3MgPSBpbnRlbF9y aW5nX2JlZ2luKHJlcSwgbnVtX2R3b3Jkcyk7CiAJaWYgKElTX0VSUihjcykpCiAJCXJldHVybiBQ VFJfRVJSKGNzKTsKIAorCWlmICh3YXRjaGRvZ19ydW5uaW5nKSB7CisJCS8qIFN0YXJ0IHdhdGNo ZG9nIHRpbWVyICovCisJCWNzID0gcmVxLT5lbmdpbmUtPmVtaXRfc3RhcnRfd2F0Y2hkb2cocmVx LCBjcyk7CisJfQorCiAJLyogRklYTUUoQkRXKTogQWRkcmVzcyBzcGFjZSBhbmQgc2VjdXJpdHkg c2VsZWN0b3JzLiAqLwogCSpjcysrID0gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUX0dFTjggfAogCQko ZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSA/IDAgOiBCSVQoOCkpIHwKQEAgLTEzNDksOCAr MTM3MCwxMyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAkqY3MrKyA9IGxvd2VyXzMyX2JpdHMob2Zmc2V0KTsKIAkqY3Mr KyA9IHVwcGVyXzMyX2JpdHMob2Zmc2V0KTsKIAkqY3MrKyA9IE1JX05PT1A7Ci0JaW50ZWxfcmlu Z19hZHZhbmNlKHJlcSwgY3MpOwogCisJaWYgKHdhdGNoZG9nX3J1bm5pbmcpIHsKKwkJLyogQ2Fu Y2VsIHdhdGNoZG9nIHRpbWVyICovCisJCWNzID0gcmVxLT5lbmdpbmUtPmVtaXRfc3RvcF93YXRj aGRvZyhyZXEsIGNzKTsKKwl9CisKKwlpbnRlbF9yaW5nX2FkdmFuY2UocmVxLCBjcyk7CiAJcmV0 dXJuIDA7CiB9CiAKQEAgLTE1MTIsNiArMTUzOCw1NCBAQCBzdGF0aWMgdm9pZCBnZW44X3dhdGNo ZG9nX2lycV9oYW5kbGVyKHVuc2lnbmVkIGxvbmcgZGF0YSkKIAlpbnRlbF91bmNvcmVfZm9yY2V3 YWtlX3B1dChkZXZfcHJpdiwgZW5naW5lLT5md19kb21haW5zKTsKIH0KIAorc3RhdGljIHUzMiAq Z2VuOF9lbWl0X3N0YXJ0X3dhdGNoZG9nKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LCB1MzIgKmNzKQoreworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5n aW5lOworCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHggPSByZXEtPmN0eDsKKwlzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CisKKwkvKiBYWFg6 IG5vIHdhdGNoZG9nIHN1cHBvcnQgaW4gQkNTIGVuZ2luZSAqLworCUdFTV9CVUdfT04oZW5naW5l LT5pZCA9PSBCQ1MpOworCisJLyoKKwkgKiB3YXRjaGRvZyByZWdpc3RlciBtdXN0IG5ldmVyIGJl IHByb2dyYW1tZWQgdG8gemVyby4gVGhpcyB3b3VsZAorCSAqIGNhdXNlIHRoZSB3YXRjaGRvZyBj b3VudGVyIHRvIGV4Y2VlZCBhbmQgbm90IGFsbG93IHRoZSBlbmdpbmUgdG8KKwkgKiBnbyBpbnRv IElETEUgc3RhdGUKKwkgKi8KKwlHRU1fQlVHX09OKGNlLT53YXRjaGRvZ190aHJlc2hvbGQgPT0g MCk7CisKKwkvKiBTZXQgY291bnRlciBwZXJpb2QgKi8KKwkqY3MrKyA9IE1JX0xPQURfUkVHSVNU RVJfSU1NKDIpOworCSpjcysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19USFJFU0goZW5n aW5lLT5tbWlvX2Jhc2UpKTsKKwkqY3MrKyA9IGNlLT53YXRjaGRvZ190aHJlc2hvbGQ7CisJLyog U3RhcnQgY291bnRlciAqLworCSpjcysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19DTlRS KGVuZ2luZS0+bW1pb19iYXNlKSk7CisJKmNzKysgPSBHRU44X1dBVENIRE9HX0VOQUJMRTsKKwkq Y3MrKyA9IE1JX05PT1A7CisKKwlyZXR1cm4gY3M7Cit9CisKK3N0YXRpYyB1MzIgKmdlbjhfZW1p dF9zdG9wX3dhdGNoZG9nKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCB1MzIgKmNz KQoreworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5naW5lOworCisJ LyogWFhYOiBubyB3YXRjaGRvZyBzdXBwb3J0IGluIEJDUyBlbmdpbmUgKi8KKwlHRU1fQlVHX09O KGVuZ2luZS0+aWQgPT0gQkNTKTsKKworCSpjcysrID0gTUlfTE9BRF9SRUdJU1RFUl9JTU0oMik7 CisJKmNzKysgPSBpOTE1X21taW9fcmVnX29mZnNldChSSU5HX0NOVFIoZW5naW5lLT5tbWlvX2Jh c2UpKTsKKworCWlmIChlbmdpbmUtPmlkID09IFJDUykKKwkJKmNzKysgPSBHRU44X1JDU19XQVRD SERPR19ESVNBQkxFOworCWVsc2UKKwkJKmNzKysgPSBHRU44X1hDU19XQVRDSERPR19ESVNBQkxF OworCisJKmNzKysgPSBNSV9OT09QOworCisJcmV0dXJuIGNzOworfQorCiAvKgogICogUmVzZXJ2 ZSBzcGFjZSBmb3IgMiBOT09QcyBhdCB0aGUgZW5kIG9mIGVhY2ggcmVxdWVzdCB0byBiZQogICog dXNlZCBhcyBhIHdvcmthcm91bmQgZm9yIG5vdCBiZWluZyBhbGxvd2VkIHRvIGRvIGxpdGUKQEAg LTE3ODAsNiArMTg1NCw4IEBAIGludCBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjhfZW1pdF9m bHVzaF9yZW5kZXI7CiAJZW5naW5lLT5lbWl0X2JyZWFkY3J1bWIgPSBnZW44X2VtaXRfYnJlYWRj cnVtYl9yZW5kZXI7CiAJZW5naW5lLT5lbWl0X2JyZWFkY3J1bWJfc3ogPSBnZW44X2VtaXRfYnJl YWRjcnVtYl9yZW5kZXJfc3o7CisJZW5naW5lLT5lbWl0X3N0YXJ0X3dhdGNoZG9nID0gZ2VuOF9l bWl0X3N0YXJ0X3dhdGNoZG9nOworCWVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nID0gZ2VuOF9l bWl0X3N0b3Bfd2F0Y2hkb2c7CiAKIAlyZXQgPSBpbnRlbF9lbmdpbmVfY3JlYXRlX3NjcmF0Y2go ZW5naW5lLCBQQUdFX1NJWkUpOwogCWlmIChyZXQpCkBAIC0xODAzLDYgKzE4NzksMTIgQEAgaW50 IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 CiAJbG9naWNhbF9yaW5nX3NldHVwKGVuZ2luZSk7CiAKKwkvKiBCQ1MgZW5naW5lIGRvZXMgbm90 IGhhdmUgYSB3YXRjaGRvZy1leHBpcmVkIGlycSAqLworCWlmIChlbmdpbmUtPmlkICE9IEJDUykg eworCQllbmdpbmUtPmVtaXRfc3RhcnRfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3RhcnRfd2F0Y2hk b2c7CisJCWVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nID0gZ2VuOF9lbWl0X3N0b3Bfd2F0Y2hk b2c7CisJfQorCiAJcmV0dXJuIGxvZ2ljYWxfcmluZ19pbml0KGVuZ2luZSk7CiB9CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmZmZlNjlmNWFlZDIuLjM0Y2Ew YzVhYzViOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMjc1 LDYgKzI3NSwxMCBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCWludAkJKCplbWl0X2Zs dXNoKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJCQkJICAgICAgdTMy IG1vZGUpOworCXUzMiAqCQkoKmVtaXRfc3RhcnRfd2F0Y2hkb2cpKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxLAorCQkJCQkgICAgICAgdTMyICpjcyk7CisJdTMyICoJCSgqZW1pdF9z dG9wX3dhdGNoZG9nKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKKwkJCQkJICAg ICAgdTMyICpjcyk7CiAjZGVmaW5lIEVNSVRfSU5WQUxJREFURQlCSVQoMCkKICNkZWZpbmUgRU1J VF9GTFVTSAlCSVQoMSkKICNkZWZpbmUgRU1JVF9CQVJSSUVSCShFTUlUX0lOVkFMSURBVEUgfCBF TUlUX0ZMVVNIKQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK