From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 1/3] drm/i915/guc: Clear preempt status before use Date: Sun, 14 Oct 2018 18:02:00 +0100 Message-ID: <20181014170202.3869-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 F28C989E06 for ; Sun, 14 Oct 2018 17:02:13 +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 LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgIHwgIDQgKyst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIHwgMzMgKysrKysr KysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDE2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggMGYxYzRmOWViZmQ4Li41 NzAzZTYyYTNkMzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0zNCw2ICszNCw4IEBA CiAjaW5jbHVkZSAiaW50ZWxfdWNfZncuaCIKICNpbmNsdWRlICJpOTE1X3ZtYS5oIgogCitzdHJ1 Y3QgZ3VjX3NoYXJlZF9jdHhfZGF0YTsKKwogc3RydWN0IGd1Y19wcmVlbXB0X3dvcmsgewogCXN0 cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsK QEAgLTYyLDcgKzY0LDcgQEAgc3RydWN0IGludGVsX2d1YyB7CiAJdm9pZCAqc3RhZ2VfZGVzY19w b29sX3ZhZGRyOwogCXN0cnVjdCBpZGEgc3RhZ2VfaWRzOwogCXN0cnVjdCBpOTE1X3ZtYSAqc2hh cmVkX2RhdGE7Ci0Jdm9pZCAqc2hhcmVkX2RhdGFfdmFkZHI7CisJc3RydWN0IGd1Y19zaGFyZWRf Y3R4X2RhdGEgKnNoYXJlZF9kYXRhX3ZhZGRyOwogCiAJc3RydWN0IGludGVsX2d1Y19jbGllbnQg KmV4ZWNidWZfY2xpZW50OwogCXN0cnVjdCBpbnRlbF9ndWNfY2xpZW50ICpwcmVlbXB0X2NsaWVu dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9u LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGVh ZTY2ODQ0MmViZS4uZmIwNDk5ZjgwYjYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTU1NSw2ICs1NTUsOCBAQCBzdGF0aWMgdm9pZCBpbmplY3Rf cHJlZW1wdF9jb250ZXh0KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlzdHJ1Y3QgaW50ZWxf Z3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5wcmVlbXB0X2NsaWVudDsKIAlzdHJ1Y3QgZ3VjX3N0 YWdlX2Rlc2MgKnN0YWdlX2Rlc2MgPSBfX2dldF9zdGFnZV9kZXNjKGNsaWVudCk7CiAJc3RydWN0 IGludGVsX2NvbnRleHQgKmNlID0gdG9faW50ZWxfY29udGV4dChjbGllbnQtPm93bmVyLCBlbmdp bmUpOworCXN0cnVjdCBndWNfY3R4X3JlcG9ydCAqcmVwb3J0ID0KKwkJJmd1Yy0+c2hhcmVkX2Rh dGFfdmFkZHItPnByZWVtcHRfY3R4X3JlcG9ydFtlbmdpbmUtPmd1Y19pZF07CiAJdTMyIGRhdGFb N107CiAKIAlpZiAoIWNlLT5yaW5nLT5lbWl0KSB7IC8qIHJlY3JlYXRlIHVwb24gbG9hZC9yZXN1 bWUgKi8KQEAgLTU4Nyw2ICs1ODksMTQgQEAgc3RhdGljIHZvaWQgaW5qZWN0X3ByZWVtcHRfY29u dGV4dChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCQkgICBHVUNfUFJFRU1QVF9CUkVBRENS VU1CX0JZVEVTIC8gc2l6ZW9mKHU2NCksIDApOwogCXNwaW5fdW5sb2NrX2lycSgmY2xpZW50LT53 cV9sb2NrKTsKIAorCS8qCisJICogR3VDIGlzIGV4cGVjdGluZyB0aGF0IHdlJ3JlIGFsc28gZ29p bmcgdG8gY2xlYXIgdGhlIGFmZmVjdGVkIGNvbnRleHQKKwkgKiBjb3VudGVyLCBsZXQncyBhbHNv IHJlc2V0IHRoZSByZXR1cm4gc3RhdHVzIHRvIG5vdCBkZXBlbmQgb24gR3VDCisJICogcmVzZXR0 aW5nIGl0IGFmdGVyIHJlY2lldmluZyBhbm90aGVyIHByZWVtcHQgYWN0aW9uCisJICovCisJcmVw b3J0LT5hZmZlY3RlZF9jb3VudCA9IDA7CisJcmVwb3J0LT5yZXBvcnRfcmV0dXJuX3N0YXR1cyA9 IElOVEVMX0dVQ19SRVBPUlRfU1RBVFVTX1VOS05PV047CisKIAkvKgogCSAqIElmIEd1QyBmaXJt d2FyZSBwZXJmb3JtcyBhbiBlbmdpbmUgcmVzZXQgd2hpbGUgdGhhdCBlbmdpbmUgaGFkCiAJICog YSBwcmVlbXB0aW9uIHBlbmRpbmcsIGl0IHdpbGwgc2V0IHRoZSB0ZXJtaW5hdGVkIGF0dHJpYnV0 ZSBiaXQKQEAgLTYyOSwyMCArNjM5LDEyIEBAIHN0YXRpYyB2b2lkIGluamVjdF9wcmVlbXB0X2Nv bnRleHQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogc3RhdGljIHZvaWQgd2FpdF9mb3JfZ3Vj X3ByZWVtcHRfcmVwb3J0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMgPSAmZW5naW5lLT5pOTE1LT5ndWM7Ci0Jc3RydWN0IGd1Y19zaGFy ZWRfY3R4X2RhdGEgKmRhdGEgPSBndWMtPnNoYXJlZF9kYXRhX3ZhZGRyOwogCXN0cnVjdCBndWNf Y3R4X3JlcG9ydCAqcmVwb3J0ID0KLQkJJmRhdGEtPnByZWVtcHRfY3R4X3JlcG9ydFtlbmdpbmUt Pmd1Y19pZF07CisJCSZndWMtPnNoYXJlZF9kYXRhX3ZhZGRyLT5wcmVlbXB0X2N0eF9yZXBvcnRb ZW5naW5lLT5ndWNfaWRdOwogCi0JV0FSTl9PTih3YWl0X2Zvcl9hdG9taWMocmVwb3J0LT5yZXBv cnRfcmV0dXJuX3N0YXR1cyA9PQorCVdBUk5fT04od2FpdF9mb3JfYXRvbWljKFJFQURfT05DRShy ZXBvcnQtPnJlcG9ydF9yZXR1cm5fc3RhdHVzKSA9PQogCQkJCUlOVEVMX0dVQ19SRVBPUlRfU1RB VFVTX0NPTVBMRVRFLAogCQkJCUdVQ19QUkVFTVBUX1BPU1RQUk9DRVNTX0RFTEFZX01TKSk7Ci0J LyoKLQkgKiBHdUMgaXMgZXhwZWN0aW5nIHRoYXQgd2UncmUgYWxzbyBnb2luZyB0byBjbGVhciB0 aGUgYWZmZWN0ZWQgY29udGV4dAotCSAqIGNvdW50ZXIsIGxldCdzIGFsc28gcmVzZXQgdGhlIHJl dHVybiBzdGF0dXMgdG8gbm90IGRlcGVuZCBvbiBHdUMKLQkgKiByZXNldHRpbmcgaXQgYWZ0ZXIg cmVjaWV2aW5nIGFub3RoZXIgcHJlZW1wdCBhY3Rpb24KLQkgKi8KLQlyZXBvcnQtPmFmZmVjdGVk X2NvdW50ID0gMDsKLQlyZXBvcnQtPnJlcG9ydF9yZXR1cm5fc3RhdHVzID0gSU5URUxfR1VDX1JF UE9SVF9TVEFUVVNfVU5LTk9XTjsKIH0KIAogc3RhdGljIHZvaWQgY29tcGxldGVfcHJlZW1wdF9j b250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKQEAgLTY1NCwxMSArNjU2LDEw IEBAIHN0YXRpYyB2b2lkIGNvbXBsZXRlX3ByZWVtcHRfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiAJaWYgKGluamVjdF9wcmVlbXB0X2hhbmcoZXhlY2xpc3RzKSkKIAkJ cmV0dXJuOwogCisJd2FpdF9mb3JfZ3VjX3ByZWVtcHRfcmVwb3J0KGVuZ2luZSk7CisKIAlleGVj bGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoZXhlY2xpc3RzKTsKIAlleGVjbGlzdHNfdW53aW5k X2luY29tcGxldGVfcmVxdWVzdHMoZXhlY2xpc3RzKTsKLQotCXdhaXRfZm9yX2d1Y19wcmVlbXB0 X3JlcG9ydChlbmdpbmUpOwotCWludGVsX3dyaXRlX3N0YXR1c19wYWdlKGVuZ2luZSwgSTkxNV9H RU1fSFdTX1BSRUVNUFRfSU5ERVgsIDApOwogfQogCiAvKioKQEAgLTcyNiw2ICs3MjcsOSBAQCBz dGF0aWMgYm9vbCBfX2d1Y19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAkJCWludCBwcmlvID0gZXhlY2xpc3RzLT5xdWV1ZV9wcmlvcml0eTsKIAogCQkJaWYgKF9fZXhl Y2xpc3RzX25lZWRfcHJlZW1wdChwcmlvLCBwb3J0X3ByaW8ocG9ydCkpKSB7CisJCQkJaW50ZWxf d3JpdGVfc3RhdHVzX3BhZ2UoZW5naW5lLAorCQkJCQkJCUk5MTVfR0VNX0hXU19QUkVFTVBUX0lO REVYLAorCQkJCQkJCTApOwogCQkJCWV4ZWNsaXN0c19zZXRfYWN0aXZlKGV4ZWNsaXN0cywKIAkJ CQkJCSAgICAgRVhFQ0xJU1RTX0FDVElWRV9QUkVFTVBUKTsKIAkJCQlxdWV1ZV93b3JrKGVuZ2lu ZS0+aTkxNS0+Z3VjLnByZWVtcHRfd3EsCkBAIC04MTYsOCArODIwLDcgQEAgc3RhdGljIHZvaWQg Z3VjX3N1Ym1pc3Npb25fdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEpCiAJfQogCiAJaWYgKGV4 ZWNsaXN0c19pc19hY3RpdmUoZXhlY2xpc3RzLCBFWEVDTElTVFNfQUNUSVZFX1BSRUVNUFQpICYm Ci0JICAgIGludGVsX3JlYWRfc3RhdHVzX3BhZ2UoZW5naW5lLCBJOTE1X0dFTV9IV1NfUFJFRU1Q VF9JTkRFWCkgPT0KLQkgICAgR1VDX1BSRUVNUFRfRklOSVNIRUQpCisJICAgIGludGVsX3JlYWRf c3RhdHVzX3BhZ2UoZW5naW5lLCBJOTE1X0dFTV9IV1NfUFJFRU1QVF9JTkRFWCkpCiAJCWNvbXBs ZXRlX3ByZWVtcHRfY29udGV4dChlbmdpbmUpOwogCiAJaWYgKCFleGVjbGlzdHNfaXNfYWN0aXZl KGV4ZWNsaXN0cywgRVhFQ0xJU1RTX0FDVElWRV9QUkVFTVBUKSkKLS0gCjIuMTkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==