From: Michel Thierry Subject: [PATCH v6 17/20] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+ Date: Tue, 18 Apr 2017 13:23:32 -0700 Message-ID: <20170418202335.35232-18-michel.thierry@intel.com> References: <20170418202335.35232-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 160496E230 for ; Tue, 18 Apr 2017 20:23:38 +0000 (UTC) In-Reply-To: <20170418202335.35232-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 NS9pbnRlbF9scmMuYyAgICAgICAgfCA4MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA0ICsrCiAzIGZp bGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCmluZGV4IDRhZjJhYjk0NTU4Yi4uODg3MDBiZGJi NGUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCkBAIC0xNTAsNiAr MTUwLDEwIEBAIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0IHsKIAkJdTMyICpscmNfcmVnX3N0YXRl OwogCQl1NjQgbHJjX2Rlc2M7CiAJCWludCBwaW5fY291bnQ7CisJCS8qKiB3YXRjaGRvZ190aHJl c2hvbGQ6IGh3IHdhdGNoZG9nIHRocmVzaG9sZCB2YWx1ZSwKKwkJICogaW4gY2xvY2sgY291bnRz CisJCSAqLworCQl1MzIgd2F0Y2hkb2dfdGhyZXNob2xkOwogCQlib29sIGluaXRpYWxpc2VkOwog CX0gZW5naW5lW0k5MTVfTlVNX0VOR0lORVNdOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IDIyNjNiOWZiOWI1MC4uN2EyMDJlNzNjZTliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwpAQCAtMTMxMCw2ICsxMzEwLDggQEAgc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkgICAgICBjb25zdCB1bnNpZ25lZCBp bnQgZmxhZ3MpCiB7CiAJdTMyICpjczsKKwl1MzIgbnVtX2R3b3JkczsKKwlib29sIHdhdGNoZG9n X3J1bm5pbmcgPSBmYWxzZTsKIAlpbnQgcmV0OwogCiAJLyogRG9uJ3QgcmVseSBpbiBodyB1cGRh dGluZyBQRFBzLCBzcGVjaWFsbHkgaW4gbGl0ZS1yZXN0b3JlLgpAQCAtMTMyOSwxMCArMTMzMSwy OSBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKIAkJcmVxLT5jdHgtPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyAmPSB+aW50ZWxf ZW5naW5lX2ZsYWcocmVxLT5lbmdpbmUpOwogCX0KIAotCWNzID0gaW50ZWxfcmluZ19iZWdpbihy ZXEsIDQpOworCS8qIGJiX3N0YXJ0IG9ubHkgKi8KKwludW1fZHdvcmRzID0gNDsKKworCS8qIGNo ZWNrIGlmIHdhdGNoZG9nIHdpbGwgYmUgcmVxdWlyZWQgKi8KKwlpZiAocmVxLT5jdHgtPmVuZ2lu ZVtyZXEtPmVuZ2luZS0+aWRdLndhdGNoZG9nX3RocmVzaG9sZCAhPSAwKSB7CisJCWlmICghcmVx LT5lbmdpbmUtPmVtaXRfc3RhcnRfd2F0Y2hkb2cgfHwKKwkJICAgICFyZXEtPmVuZ2luZS0+ZW1p dF9zdG9wX3dhdGNoZG9nKQorCQkJcmV0dXJuIC1FSU5WQUw7CisKKwkJLyogKyBzdGFydF93YXRj aGRvZyAoNikgKyBzdG9wX3dhdGNoZG9nICg0KSAqLworCQludW1fZHdvcmRzICs9IDEwOworCQl3 YXRjaGRvZ19ydW5uaW5nID0gdHJ1ZTsKKwl9CisKKwljcyA9IGludGVsX3JpbmdfYmVnaW4ocmVx LCBudW1fZHdvcmRzKTsKIAlpZiAoSVNfRVJSKGNzKSkKIAkJcmV0dXJuIFBUUl9FUlIoY3MpOwog CisJaWYgKHdhdGNoZG9nX3J1bm5pbmcpIHsKKwkJLyogU3RhcnQgd2F0Y2hkb2cgdGltZXIgKi8K KwkJY3MgPSByZXEtPmVuZ2luZS0+ZW1pdF9zdGFydF93YXRjaGRvZyhyZXEsIGNzKTsKKwl9CisK IAkvKiBGSVhNRShCRFcpOiBBZGRyZXNzIHNwYWNlIGFuZCBzZWN1cml0eSBzZWxlY3RvcnMuICov CiAJKmNzKysgPSBNSV9CQVRDSF9CVUZGRVJfU1RBUlRfR0VOOCB8CiAJCShmbGFncyAmIEk5MTVf RElTUEFUQ0hfU0VDVVJFID8gMCA6IEJJVCg4KSkgfApAQCAtMTM0MCw4ICsxMzYxLDEzIEBAIHN0 YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAogCSpjcysrID0gbG93ZXJfMzJfYml0cyhvZmZzZXQpOwogCSpjcysrID0gdXBwZXJfMzJf Yml0cyhvZmZzZXQpOwogCSpjcysrID0gTUlfTk9PUDsKLQlpbnRlbF9yaW5nX2FkdmFuY2UocmVx LCBjcyk7CiAKKwlpZiAod2F0Y2hkb2dfcnVubmluZykgeworCQkvKiBDYW5jZWwgd2F0Y2hkb2cg dGltZXIgKi8KKwkJY3MgPSByZXEtPmVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nKHJlcSwgY3Mp OworCX0KKworCWludGVsX3JpbmdfYWR2YW5jZShyZXEsIGNzKTsKIAlyZXR1cm4gMDsKIH0KIApA QCAtMTUwOCw2ICsxNTM0LDQ5IEBAIHN0YXRpYyB2b2lkIGdlbjhfd2F0Y2hkb2dfaXJxX2hhbmRs ZXIodW5zaWduZWQgbG9uZyBkYXRhKQogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9w cml2LCBlbmdpbmUtPmZ3X2RvbWFpbnMpOwogfQogCitzdGF0aWMgdTMyICpnZW44X2VtaXRfc3Rh cnRfd2F0Y2hkb2coc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiAqY3MpCit7 CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxLT5lbmdpbmU7CisJc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCA9IHJlcS0+Y3R4OworCXN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjZSA9ICZjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXTsKKworCS8qIFhYWDogbm8gd2F0Y2hkb2cg c3VwcG9ydCBpbiBCQ1MgZW5naW5lICovCisJR0VNX0JVR19PTihlbmdpbmUtPmlkID09IEJDUyk7 CisKKwkvKgorCSAqIHdhdGNoZG9nIHJlZ2lzdGVyIG11c3QgbmV2ZXIgYmUgcHJvZ3JhbW1lZCB0 byB6ZXJvLiBUaGlzIHdvdWxkCisJICogY2F1c2UgdGhlIHdhdGNoZG9nIGNvdW50ZXIgdG8gZXhj ZWVkIGFuZCBub3QgYWxsb3cgdGhlIGVuZ2luZSB0bworCSAqIGdvIGludG8gSURMRSBzdGF0ZQor CSAqLworCUdFTV9CVUdfT04oY2UtPndhdGNoZG9nX3RocmVzaG9sZCA9PSAwKTsKKworCS8qIFNl dCBjb3VudGVyIHBlcmlvZCAqLworCSpjcysrID0gTUlfTE9BRF9SRUdJU1RFUl9JTU0oMik7CisJ KmNzKysgPSBpOTE1X21taW9fcmVnX29mZnNldChSSU5HX1RIUkVTSChlbmdpbmUtPm1taW9fYmFz ZSkpOworCSpjcysrID0gY2UtPndhdGNoZG9nX3RocmVzaG9sZDsKKwkvKiBTdGFydCBjb3VudGVy ICovCisJKmNzKysgPSBpOTE1X21taW9fcmVnX29mZnNldChSSU5HX0NOVFIoZW5naW5lLT5tbWlv X2Jhc2UpKTsKKwkqY3MrKyA9IEdFTjhfV0FUQ0hET0dfRU5BQkxFOworCSpjcysrID0gTUlfTk9P UDsKKworCXJldHVybiBjczsKK30KKworc3RhdGljIHUzMiAqZ2VuOF9lbWl0X3N0b3Bfd2F0Y2hk b2coc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiAqY3MpCit7CisJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxLT5lbmdpbmU7CisKKwkvKiBYWFg6IG5vIHdh dGNoZG9nIHN1cHBvcnQgaW4gQkNTIGVuZ2luZSAqLworCUdFTV9CVUdfT04oZW5naW5lLT5pZCA9 PSBCQ1MpOworCisJKmNzKysgPSBNSV9MT0FEX1JFR0lTVEVSX0lNTSgyKTsKKwkqY3MrKyA9IGk5 MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ05UUihlbmdpbmUtPm1taW9fYmFzZSkpOworCSpjcysr ID0gZ2V0X3dhdGNoZG9nX2Rpc2FibGUoZW5naW5lKTsKKwkqY3MrKyA9IE1JX05PT1A7CisKKwly ZXR1cm4gY3M7Cit9CisKIC8qCiAgKiBSZXNlcnZlIHNwYWNlIGZvciAyIE5PT1BzIGF0IHRoZSBl bmQgb2YgZWFjaCByZXF1ZXN0IHRvIGJlCiAgKiB1c2VkIGFzIGEgd29ya2Fyb3VuZCBmb3Igbm90 IGJlaW5nIGFsbG93ZWQgdG8gZG8gbGl0ZQpAQCAtMTc3Niw2ICsxODQ1LDggQEAgaW50IGxvZ2lj YWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5n aW5lLT5lbWl0X2ZsdXNoID0gZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcjsKIAllbmdpbmUtPmVtaXRf YnJlYWRjcnVtYiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3JlbmRlcjsKIAllbmdpbmUtPmVtaXRf YnJlYWRjcnVtYl9zeiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3JlbmRlcl9zejsKKwllbmdpbmUt PmVtaXRfc3RhcnRfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3RhcnRfd2F0Y2hkb2c7CisJZW5naW5l LT5lbWl0X3N0b3Bfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3RvcF93YXRjaGRvZzsKIAogCXJldCA9 IGludGVsX2VuZ2luZV9jcmVhdGVfc2NyYXRjaChlbmdpbmUsIFBBR0VfU0laRSk7CiAJaWYgKHJl dCkKQEAgLTE3OTksNiArMTg3MCwxMiBAQCBpbnQgbG9naWNhbF94Y3NfcmluZ19pbml0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlsb2dpY2FsX3Jpbmdfc2V0dXAoZW5naW5l KTsKIAorCS8qIEJDUyBlbmdpbmUgZG9lcyBub3QgaGF2ZSBhIHdhdGNoZG9nLWV4cGlyZWQgaXJx ICovCisJaWYgKGVuZ2luZS0+aWQgIT0gQkNTKSB7CisJCWVuZ2luZS0+ZW1pdF9zdGFydF93YXRj aGRvZyA9IGdlbjhfZW1pdF9zdGFydF93YXRjaGRvZzsKKwkJZW5naW5lLT5lbWl0X3N0b3Bfd2F0 Y2hkb2cgPSBnZW44X2VtaXRfc3RvcF93YXRjaGRvZzsKKwl9CisKIAlyZXR1cm4gbG9naWNhbF9y aW5nX2luaXQoZW5naW5lKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCmluZGV4IDkyN2YwYzA2Y2JlNi4uMDM5MmJkNWZkMzAwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0yNzksNiArMjc5LDEwIEBAIHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgewogCiAJaW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxdWVzdCwKIAkJCQkgICAgICB1MzIgbW9kZSk7CisJdTMyICoJCSgqZW1pdF9zdGFy dF93YXRjaGRvZykoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJCSAgICAg ICB1MzIgKmNzKTsKKwl1MzIgKgkJKCplbWl0X3N0b3Bfd2F0Y2hkb2cpKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxLAorCQkJCQkgICAgICB1MzIgKmNzKTsKICNkZWZpbmUgRU1JVF9J TlZBTElEQVRFCUJJVCgwKQogI2RlZmluZSBFTUlUX0ZMVVNICUJJVCgxKQogI2RlZmluZSBFTUlU X0JBUlJJRVIJKEVNSVRfSU5WQUxJREFURSB8IEVNSVRfRkxVU0gpCi0tIAoyLjExLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=