From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915/execlists: Always reset the context's RING registers Date: Mon, 8 Apr 2019 14:15:06 +0100 Message-ID: <20190408131506.1180-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95BB4890EF for ; Mon, 8 Apr 2019 13:15:32 +0000 (UTC) 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 RHVyaW5nIHJlc2V0LCB3ZSB0cnkgYW5kIHN0b3AgdGhlIGFjdGl2ZSByaW5nLiBUaGlzIGhhcyB0 aGUgY29uc2VxdWVuY2UKdGhhdCB3ZSBvZnRlbiBjbG9iYmVyIHRoZSBSSU5HIHJlZ2lzdGVycyB3 aXRoaW4gdGhlIGNvbnRleHQgaW1hZ2UuIFdoZW4Kd2UgZmluZCBhbiBhY3RpdmUgcmVxdWVzdCwg d2UgdXBkYXRlIHRoZSBjb250ZXh0IGltYWdlIHRvIHJlcnVuIHRoYXQKcmVxdWVzdCAoaWYgaXQg d2FzIGd1aWx0eSwgd2UgcmVwbGFjZSB0aGUgaGFuZ2luZyB1c2VyIHBheWxvYWQgd2l0aApOT1Bz KS4gSG93ZXZlciwgd2Ugd2VyZSBpZ25vcmluZyBhbiBhY3RpdmUgY29udGV4dCBpZiB0aGUgcmVx dWVzdCBoYWQKY29tcGxldGVkLCB3aXRoIHRoZSBjb25zZXF1ZW5jZSB0aGF0IHRoZSBuZXh0IHN1 Ym1pc3Npb24gb24gdGhhdCByZXF1ZXN0CndvdWxkIHN0YXJ0IHdpdGggUklOR19IRUFEPT0wIGFu ZCBub3QgdGhlIHRhaWwgb2YgdGhlIHByZXZpb3VzIHJlcXVlc3QsCmNhdXNpbmcgYWxsIHJlcXVl c3RzIHN0aWxsIGluIHRoZSByaW5nIHRvIGJlIHJlcnVuLiBSYXJlLCBidXQKb2NjYXNpb25hbGx5 IHNlZW4gd2l0aGluIENJIHdoZXJlIHdlIHdvdWxkIHNwb3QgdGhhdCB0aGUgY29udGV4dCBzZXFu bwp3b3VsZCByZXZlcnNlIGFuZCBjb21wbGFpbiB0aGF0IHdlIHdlcmUgcmV0aXJpbmcgYW4gaW5j b21wbGV0ZSByZXF1ZXN0LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4Lmlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDQ2ICsrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9u cygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA2OTMx ZGJiMjg4OGMuLjc2MDk1ZjQwY2RkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE5 MDQsNyArMTkwNCw2IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19yZXNldF9wcmVwYXJlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCS8qIEFuZCBmbHVzaCBhbnkgY3VycmVudCBk aXJlY3Qgc3VibWlzc2lvbi4gKi8KIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT50aW1lbGlu ZS5sb2NrLCBmbGFncyk7Ci0JcHJvY2Vzc19jc2IoZW5naW5lKTsgLyogZHJhaW4gcHJlZW1wdGlv biBldmVudHMgKi8KIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLmxv Y2ssIGZsYWdzKTsKIH0KIApAQCAtMTkyOCwxMiArMTkyNywyOSBAQCBzdGF0aWMgYm9vbCBscmNf cmVnc19vayhjb25zdCBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkKIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19yZXNldChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJvb2wgc3RhbGxlZCkK IHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZl bmdpbmUtPmV4ZWNsaXN0czsKLQlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycTsKKwlzdHJ1Y3QgaTkx NV9yZXF1ZXN0ICpycSA9IE5VTEw7CisJc3RydWN0IGludGVsX2NvbnRleHQgKmNlOwogCXVuc2ln bmVkIGxvbmcgZmxhZ3M7CiAJdTMyICpyZWdzOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2lu ZS0+dGltZWxpbmUubG9jaywgZmxhZ3MpOwogCisJR0VNX1RSQUNFKCIlc1xuIiwgZW5naW5lLT5u YW1lKTsKKwlwcm9jZXNzX2NzYihlbmdpbmUpOyAvKiBkcmFpbiBwcmVlbXB0aW9uIGV2ZW50cyAq LworCisJLyogRm9sbG93aW5nIHRoZSByZXNldCwgd2UgbmVlZCB0byByZWxvYWQgdGhlIENTQiBy ZWFkL3dyaXRlIHBvaW50ZXJzICovCisJcmVzZXRfY3NiX3BvaW50ZXJzKCZlbmdpbmUtPmV4ZWNs aXN0cyk7CisKKwkvKgorCSAqIFNhdmUgdGhlIGN1cnJlbnRseSBleGVjdXRpbmcgY29udGV4dCwg ZXZlbiBpZiB3ZSBjb21wbGV0ZWQKKwkgKiBpdCdzIHJlcXVlc3QsIGl0IHdhcyBzdGlsbCBydW5u aW5nIGF0IHRoZSB0aW1lIG9mIHRoZQorCSAqIHJlc2V0IGFuZCB3aWxsIGhhdmUgYmVlbiBjbG9i YmVyZWQuCisJICovCisJaWYgKCFwb3J0X2lzc2V0KGV4ZWNsaXN0cy0+cG9ydCkpCisJCWdvdG8g b3V0X3VubG9jazsKKworCWNlID0gcG9ydF9yZXF1ZXN0KGV4ZWNsaXN0cy0+cG9ydCktPmh3X2Nv bnRleHQ7CisKIAkvKgogCSAqIENhdGNoIHVwIHdpdGggYW55IG1pc3NlZCBjb250ZXh0LXN3aXRj aCBpbnRlcnJ1cHRzLgogCSAqCkBAIC0xOTQ3LDEyICsxOTYzLDEwIEBAIHN0YXRpYyB2b2lkIGV4 ZWNsaXN0c19yZXNldChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJvb2wgc3RhbGxl ZCkKIAogCS8qIFB1c2ggYmFjayBhbnkgaW5jb21wbGV0ZSByZXF1ZXN0cyBmb3IgcmVwbGF5IGFm dGVyIHRoZSByZXNldC4gKi8KIAlycSA9IF9fdW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoZW5n aW5lKTsKLQotCS8qIEZvbGxvd2luZyB0aGUgcmVzZXQsIHdlIG5lZWQgdG8gcmVsb2FkIHRoZSBD U0IgcmVhZC93cml0ZSBwb2ludGVycyAqLwotCXJlc2V0X2NzYl9wb2ludGVycygmZW5naW5lLT5l eGVjbGlzdHMpOwotCiAJaWYgKCFycSkKLQkJZ290byBvdXRfdW5sb2NrOworCQlnb3RvIG91dF9y ZXBsYXk7CisKKwlHRU1fQlVHX09OKHJxLT5od19jb250ZXh0ICE9IGNlKTsKIAogCS8qCiAJICog SWYgdGhpcyByZXF1ZXN0IGhhc24ndCBzdGFydGVkIHlldCwgZS5nLiBpdCBpcyB3YWl0aW5nIG9u IGEKQEAgLTE5NjcsNyArMTk4MSw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19yZXNldChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJvb2wgc3RhbGxlZCkKIAkgKiBwZXJmZWN0bHkg YW5kIHdlIGRvIG5vdCBuZWVkIHRvIGZsYWcgdGhlIHJlc3VsdCBhcyBiZWluZyBlcnJvbmVvdXMu CiAJICovCiAJaWYgKCFpOTE1X3JlcXVlc3Rfc3RhcnRlZChycSkgJiYgbHJjX3JlZ3Nfb2socnEp KQotCQlnb3RvIG91dF91bmxvY2s7CisJCWdvdG8gb3V0X3JlcGxheTsKIAogCS8qCiAJICogSWYg dGhlIHJlcXVlc3Qgd2FzIGlubm9jZW50LCB3ZSBsZWF2ZSB0aGUgcmVxdWVzdCBpbiB0aGUgRUxT UApAQCAtMTk4Miw3ICsxOTk2LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX3Jlc2V0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgYm9vbCBzdGFsbGVkKQogCSAqLwogCWk5MTVfcmVz ZXRfcmVxdWVzdChycSwgc3RhbGxlZCk7CiAJaWYgKCFzdGFsbGVkICYmIGxyY19yZWdzX29rKHJx KSkKLQkJZ290byBvdXRfdW5sb2NrOworCQlnb3RvIG91dF9yZXBsYXk7CiAKIAkvKgogCSAqIFdl IHdhbnQgYSBzaW1wbGUgY29udGV4dCArIHJpbmcgdG8gZXhlY3V0ZSB0aGUgYnJlYWRjcnVtYiB1 cGRhdGUuCkBAIC0xOTkyLDIxICsyMDA2LDIzIEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19yZXNl dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJvb2wgc3RhbGxlZCkKIAkgKiBmdXR1 cmUgcmVxdWVzdCB3aWxsIGJlIGFmdGVyIHVzZXJzcGFjZSBoYXMgaGFkIHRoZSBvcHBvcnR1bml0 eQogCSAqIHRvIHJlY3JlYXRlIGl0cyBvd24gc3RhdGUuCiAJICovCi0JcmVncyA9IHJxLT5od19j b250ZXh0LT5scmNfcmVnX3N0YXRlOworCXJlZ3MgPSBjZS0+bHJjX3JlZ19zdGF0ZTsKIAlpZiAo ZW5naW5lLT5waW5uZWRfZGVmYXVsdF9zdGF0ZSkgewogCQltZW1jcHkocmVncywgLyogc2tpcCBy ZXN0b3JpbmcgdGhlIHZhbmlsbGEgUFBIV1NQICovCiAJCSAgICAgICBlbmdpbmUtPnBpbm5lZF9k ZWZhdWx0X3N0YXRlICsgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFLAogCQkgICAgICAgZW5naW5l LT5jb250ZXh0X3NpemUgLSBQQUdFX1NJWkUpOwogCX0KKwlleGVjbGlzdHNfaW5pdF9yZWdfc3Rh dGUocmVncywgY2UsIGVuZ2luZSwgY2UtPnJpbmcpOwogCiAJLyogUmVydW4gdGhlIHJlcXVlc3Q7 IGl0cyBwYXlsb2FkIGhhcyBiZWVuIG5ldXRlcmVkIChpZiBndWlsdHkpLiAqLwotCXJxLT5yaW5n LT5oZWFkID0gaW50ZWxfcmluZ193cmFwKHJxLT5yaW5nLCBycS0+aGVhZCk7Ci0JaW50ZWxfcmlu Z191cGRhdGVfc3BhY2UocnEtPnJpbmcpOwotCi0JZXhlY2xpc3RzX2luaXRfcmVnX3N0YXRlKHJl Z3MsIHJxLT5od19jb250ZXh0LCBlbmdpbmUsIHJxLT5yaW5nKTsKLQlfX2V4ZWNsaXN0c191cGRh dGVfcmVnX3N0YXRlKHJxLT5od19jb250ZXh0LCBlbmdpbmUpOworb3V0X3JlcGxheToKKwljZS0+ cmluZy0+aGVhZCA9CisJCWludGVsX3Jpbmdfd3JhcChjZS0+cmluZywgcnEgPyBycS0+aGVhZCA6 IGNlLT5yaW5nLT50YWlsKTsKKwlpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShjZS0+cmluZyk7CisJ X19leGVjbGlzdHNfdXBkYXRlX3JlZ19zdGF0ZShjZSwgZW5naW5lKTsKIAogb3V0X3VubG9jazoK KwlleGVjbGlzdHNfY2xlYXJfYWxsX2FjdGl2ZShleGVjbGlzdHMpOwogCXNwaW5fdW5sb2NrX2ly cXJlc3RvcmUoJmVuZ2luZS0+dGltZWxpbmUubG9jaywgZmxhZ3MpOwogfQogCi0tIAoyLjIwLjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==