From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carlos Santa Subject: drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+ Date: Fri, 4 Jan 2019 18:39:56 -0800 Message-ID: <20190105024001.37629-4-carlos.santa@intel.com> References: <20190105024001.37629-1-carlos.santa@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64F866E63F for ; Sat, 5 Jan 2019 02:40:06 +0000 (UTC) In-Reply-To: <20190105024001.37629-1-carlos.santa@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: Michel Thierry List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KCkVtaXQgdGhl IHJlcXVpcmVkIGNvbW1hbmRzIGludG8gdGhlIHJpbmcgYnVmZmVyIGZvciBzdGFydGluZyBhbmQK c3RvcHBpbmcgdGhlIHdhdGNoZG9nIHRpbWVyIGJlZm9yZS9hZnRlciBiYXRjaCBidWZmZXIgc3Rh cnQgZHVyaW5nCmJhdGNoIGJ1ZmZlciBzdWJtaXNzaW9uLgoKdjI6IFN1cHBvcnQgd2F0Y2hkb2cg dGhyZXNob2xkIHBlciBjb250ZXh0IGVuZ2luZSwgbWVyZ2UgbHJpIGNvbW1hbmRzLAphbmQgbW92 ZSB3YXRjaGRvZyBjb21tYW5kcyBlbWlzc2lvbiB0byBlbWl0X2JiX3N0YXJ0LiBSZXF1ZXN0IHNw YWNlIG9mCmNvbWJpbmVkIHN0YXJ0X3dhdGNoZG9nLCBiYl9zdGFydCBhbmQgc3RvcF93YXRjaGRv ZyB0byBhdm9pZCBhbnkgZXJyb3IKYWZ0ZXIgZW1pdHRpbmcgYmJfc3RhcnQuCgp2MzogVGhlcmUg d2VyZSB0b28gbWFueSByZXEtPmVuZ2luZSBpbiBlbWl0X2JiX3N0YXJ0LgpVc2UgR0VNX0JVR19P TiBpbnN0ZWFkIG9mIHJldHVybmluZyBhIHZlcnkgbGF0ZSBFSU5WQUwgaW4gdGhlIHJlbW90ZQpj YXNlIG9mIHdhdGNoZG9nIG1pc3Byb2dyYW1taW5nOyBzZXQgY29ycmVjdCBMUkkgY21kIHNpemUg aW4KZW1pdF9zdG9wX3dhdGNoZG9nLiAoQ2hyaXMpCgp2NDogUmViYXNlLgp2NTogdXNlIHRvX2lu dGVsX2NvbnRleHQgaW5zdGVhZCBvZiBjdHgtPmVuZ2luZS4KdjY6IFJlYmFzZS4KCkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEFudG9uaW8gQXJnZW56aWFu byA8YW50b25pby5hcmdlbnppYW5vQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5 IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IENhcmxvcyBTYW50YSA8 Y2FybG9zLnNhbnRhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmggfCAgNCArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAg ICAgIHwgODAgKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIHwgIDQgKysKIDMgZmlsZXMgY2hhbmdlZCwgODYgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9jb250ZXh0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmgKaW5kZXggZjZkODcwYjFmNzNlLi42MmY0ZWIwNDk4NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9jb250ZXh0LmgKQEAgLTE2OSw2ICsxNjksMTAgQEAgc3RydWN0IGk5MTVfZ2Vt X2NvbnRleHQgewogCQl1MzIgKmxyY19yZWdfc3RhdGU7CiAJCXU2NCBscmNfZGVzYzsKIAkJaW50 IHBpbl9jb3VudDsKKwkJLyoqIHdhdGNoZG9nX3RocmVzaG9sZDogaHcgd2F0Y2hkb2cgdGhyZXNo b2xkIHZhbHVlLAorCQkgKiBpbiBjbG9jayBjb3VudHMKKwkJICovCisJCXUzMiB3YXRjaGRvZ190 aHJlc2hvbGQ7CiAKIAkJY29uc3Qgc3RydWN0IGludGVsX2NvbnRleHRfb3BzICpvcHM7CiAJfSBf X2VuZ2luZVtJOTE1X05VTV9FTkdJTkVTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXgg ZTFkY2RmNTQ1YmVlLi4wZWE1YTM3YzMzNTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBA IC0xODcyLDEyICsxODcyLDMzIEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0cnVj dCBpOTE1X3JlcXVlc3QgKnJxLAogCQkJICAgICAgdTY0IG9mZnNldCwgdTMyIGxlbiwKIAkJCSAg ICAgIGNvbnN0IHVuc2lnbmVkIGludCBmbGFncykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUgPSBycS0+ZW5naW5lOwogCXUzMiAqY3M7CisJdTMyIG51bV9kd29yZHM7CisJYm9v bCB3YXRjaGRvZ19ydW5uaW5nID0gZmFsc2U7CiAKLQljcyA9IGludGVsX3JpbmdfYmVnaW4ocnEs IDYpOworCS8qIGJiX3N0YXJ0IG9ubHkgKi8KKwludW1fZHdvcmRzID0gNjsKKworCS8qIGNoZWNr IGlmIHdhdGNoZG9nIHdpbGwgYmUgcmVxdWlyZWQgKi8KKwlpZiAodG9faW50ZWxfY29udGV4dChy cS0+Z2VtX2NvbnRleHQsIGVuZ2luZSktPndhdGNoZG9nX3RocmVzaG9sZCAhPSAwKSB7CisJCUdF TV9CVUdfT04oIWVuZ2luZS0+ZW1pdF9zdGFydF93YXRjaGRvZyB8fAorCQkJICAgIWVuZ2luZS0+ ZW1pdF9zdG9wX3dhdGNoZG9nKTsKKworCQkvKiArIHN0YXJ0X3dhdGNoZG9nICg2KSArIHN0b3Bf d2F0Y2hkb2cgKDQpICovCisJCW51bV9kd29yZHMgKz0gMTA7CisJCXdhdGNoZG9nX3J1bm5pbmcg PSB0cnVlOworICAgICAgICB9CisKKwljcyA9IGludGVsX3JpbmdfYmVnaW4ocnEsIG51bV9kd29y ZHMpOwogCWlmIChJU19FUlIoY3MpKQogCQlyZXR1cm4gUFRSX0VSUihjcyk7CiAKKwlpZiAod2F0 Y2hkb2dfcnVubmluZykgeworCQkvKiBTdGFydCB3YXRjaGRvZyB0aW1lciAqLworCQljcyA9IGVu Z2luZS0+ZW1pdF9zdGFydF93YXRjaGRvZyhycSwgY3MpOworCX0KKwogCS8qCiAJICogV2FEaXNh YmxlQ3R4UmVzdG9yZUFyYml0cmF0aW9uOmJkdyxjaHYKIAkgKgpAQCAtMTkwNiw4ICsxOTI3LDEy IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJx LAogCSpjcysrID0gTUlfQVJCX09OX09GRiB8IE1JX0FSQl9ESVNBQkxFOwogCSpjcysrID0gTUlf Tk9PUDsKIAotCWludGVsX3JpbmdfYWR2YW5jZShycSwgY3MpOworCWlmICh3YXRjaGRvZ19ydW5u aW5nKSB7CisJCS8qIENhbmNlbCB3YXRjaGRvZyB0aW1lciAqLworCQljcyA9IGVuZ2luZS0+ZW1p dF9zdG9wX3dhdGNoZG9nKHJxLCBjcyk7CisJfQogCisJaW50ZWxfcmluZ19hZHZhbmNlKHJxLCBj cyk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTIwOTEsNiArMjExNiw0OSBAQCBzdGF0aWMgdm9pZCBn ZW44X3dhdGNoZG9nX2lycV9oYW5kbGVyKHVuc2lnbmVkIGxvbmcgZGF0YSkKIAlpbnRlbF91bmNv cmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgZndfZG9tYWlucyk7CiB9CiAKK3N0YXRpYyB1MzIg KmdlbjhfZW1pdF9zdGFydF93YXRjaGRvZyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSwgdTMyICpj cykKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBycS0+ZW5naW5lOworCXN0 cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHggPSBycS0+Z2VtX2NvbnRleHQ7CisJc3RydWN0IGlu dGVsX2NvbnRleHQgKmNlID0gdG9faW50ZWxfY29udGV4dChjdHgsIGVuZ2luZSk7CisKKwkvKiBY WFg6IG5vIHdhdGNoZG9nIHN1cHBvcnQgaW4gQkNTIGVuZ2luZSAqLworCUdFTV9CVUdfT04oZW5n aW5lLT5pZCA9PSBCQ1MpOworCisJLyoKKwkgKiB3YXRjaGRvZyByZWdpc3RlciBtdXN0IG5ldmVy IGJlIHByb2dyYW1tZWQgdG8gemVyby4gVGhpcyB3b3VsZAorCSAqIGNhdXNlIHRoZSB3YXRjaGRv ZyBjb3VudGVyIHRvIGV4Y2VlZCBhbmQgbm90IGFsbG93IHRoZSBlbmdpbmUgdG8KKwkgKiBnbyBp bnRvIElETEUgc3RhdGUKKwkgKi8KKwlHRU1fQlVHX09OKGNlLT53YXRjaGRvZ190aHJlc2hvbGQg PT0gMCk7CisKKwkvKiBTZXQgY291bnRlciBwZXJpb2QgKi8KKwkqY3MrKyA9IE1JX0xPQURfUkVH SVNURVJfSU1NKDIpOworCSpjcysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19USFJFU0go ZW5naW5lLT5tbWlvX2Jhc2UpKTsKKwkqY3MrKyA9IGNlLT53YXRjaGRvZ190aHJlc2hvbGQ7CisJ LyogU3RhcnQgY291bnRlciAqLworCSpjcysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19D TlRSKGVuZ2luZS0+bW1pb19iYXNlKSk7CisJKmNzKysgPSBHRU44X1dBVENIRE9HX0VOQUJMRTsK KwkqY3MrKyA9IE1JX05PT1A7CisKKwlyZXR1cm4gY3M7Cit9CisKK3N0YXRpYyB1MzIgKmdlbjhf ZW1pdF9zdG9wX3dhdGNoZG9nKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLCB1MzIgKmNzKQorewor CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJxLT5lbmdpbmU7CisKKwkvKiBYWFg6 IG5vIHdhdGNoZG9nIHN1cHBvcnQgaW4gQkNTIGVuZ2luZSAqLworCUdFTV9CVUdfT04oZW5naW5l LT5pZCA9PSBCQ1MpOworCisJKmNzKysgPSBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKTsKKwkqY3Mr KyA9IGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ05UUihlbmdpbmUtPm1taW9fYmFzZSkpOwor CSpjcysrID0gZ2V0X3dhdGNoZG9nX2Rpc2FibGUoZW5naW5lKTsKKwkqY3MrKyA9IE1JX05PT1A7 CisKKwlyZXR1cm4gY3M7Cit9CisKIC8qCiAgKiBSZXNlcnZlIHNwYWNlIGZvciAyIE5PT1BzIGF0 IHRoZSBlbmQgb2YgZWFjaCByZXF1ZXN0IHRvIGJlCiAgKiB1c2VkIGFzIGEgd29ya2Fyb3VuZCBm b3Igbm90IGJlaW5nIGFsbG93ZWQgdG8gZG8gbGl0ZQpAQCAtMjM2Niw2ICsyNDM0LDggQEAgaW50 IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJZW5naW5lLT5lbWl0X2ZsdXNoID0gZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcjsKIAllbmdpbmUt PmVtaXRfYnJlYWRjcnVtYiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3JjczsKIAllbmdpbmUtPmVt aXRfYnJlYWRjcnVtYl9zeiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3Jjc19zejsKKwllbmdpbmUt PmVtaXRfc3RhcnRfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3RhcnRfd2F0Y2hkb2c7CisJZW5naW5l LT5lbWl0X3N0b3Bfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3RvcF93YXRjaGRvZzsKIAogCXJldCA9 IGxvZ2ljYWxfcmluZ19pbml0KGVuZ2luZSk7CiAJaWYgKHJldCkKQEAgLTIzOTIsNiArMjQ2Miwx MiBAQCBpbnQgbG9naWNhbF94Y3NfcmluZ19pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIHsKIAlsb2dpY2FsX3Jpbmdfc2V0dXAoZW5naW5lKTsKIAorCS8qIEJDUyBlbmdpbmUg ZG9lcyBub3QgaGF2ZSBhIHdhdGNoZG9nLWV4cGlyZWQgaXJxICovCisJaWYgKGVuZ2luZS0+aWQg IT0gQkNTKSB7CisJCWVuZ2luZS0+ZW1pdF9zdGFydF93YXRjaGRvZyA9IGdlbjhfZW1pdF9zdGFy dF93YXRjaGRvZzsKKwkJZW5naW5lLT5lbWl0X3N0b3Bfd2F0Y2hkb2cgPSBnZW44X2VtaXRfc3Rv cF93YXRjaGRvZzsKKwl9CisKIAlyZXR1cm4gbG9naWNhbF9yaW5nX2luaXQoZW5naW5lKTsKIH0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDZjYjhiNDI4MDAz NS4uYzdhYTg0MmEyZGIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CkBAIC00NjksNiArNDY5LDEwIEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCWludAkJKCpp bml0X2NvbnRleHQpKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKTsKIAogCWludAkJKCplbWl0X2Zs dXNoKShzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCB1MzIgbW9kZSk7CisJdTMyICoJCSgq ZW1pdF9zdGFydF93YXRjaGRvZykoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCisJCQkJCSAgICAg ICB1MzIgKmNzKTsKKwl1MzIgKgkJKCplbWl0X3N0b3Bfd2F0Y2hkb2cpKHN0cnVjdCBpOTE1X3Jl cXVlc3QgKnJxLAorCQkJCQkgICAgICB1MzIgKmNzKTsKICNkZWZpbmUgRU1JVF9JTlZBTElEQVRF CUJJVCgwKQogI2RlZmluZSBFTUlUX0ZMVVNICUJJVCgxKQogI2RlZmluZSBFTUlUX0JBUlJJRVIJ KEVNSVRfSU5WQUxJREFURSB8IEVNSVRfRkxVU0gpCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=