From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 10/10] drm/i915: check that we are in an RPM atomic section in GGTT PTE updaters Date: Tue, 15 Dec 2015 20:10:38 +0200 Message-ID: <1450203038-5150-11-git-send-email-imre.deak@intel.com> References: <1450203038-5150-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F0376E766 for ; Tue, 15 Dec 2015 10:10:57 -0800 (PST) In-Reply-To: <1450203038-5150-1-git-send-email-imre.deak@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 VGhlIGRldmljZSBzaG91bGQgYmUgb24gZm9yIHRoZSB3aG9sZSBkdXJhdGlvbiBvZiB0aGUgdXBk YXRlLCBzbyBjaGVjawpmb3IgdGhpcy4KCnYyOgotIHVzZSB0aGUgZXhpc3RpbmcgZGV2X3ByaXYg ZGlyZWN0bHkgZXZlcnl3aGVyZSAoVmlsbGUpCnYzOgotIGNoZWNrIGFsc28gdGhhdCB3ZSBhcmUg aW4gYW4gUlBNIGF0b21pYyBzZWN0aW9uIChDaHJpcykKLSBhZGQgdGhlIGFzc2VydCB0byBpOTE1 X2dndHRfaW5zZXJ0X2VudHJpZXMvY2xlYXJfcmFuZ2UgdG9vIChDaHJpcykKClNpZ25lZC1vZmYt Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAx IGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKaW5kZXggN2NmYTFiOS4uYzE0YjhmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKQEAgLTIzNTEsNiArMjM1MSw5IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlpbnQgaSA9IDA7CiAJc3Ry dWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwogCWRtYV9hZGRyX3QgYWRkciA9IDA7IC8qIHNodXQg dXAgZ2NjICovCisJaW50IHJwbV9hdG9taWNfc2VxOworCisJcnBtX2F0b21pY19zZXEgPSBhc3Nl cnRfcnBtX2F0b21pY19iZWdpbihkZXZfcHJpdik7CiAKIAlmb3JfZWFjaF9zZ19wYWdlKHN0LT5z Z2wsICZzZ19pdGVyLCBzdC0+bmVudHMsIDApIHsKIAkJYWRkciA9IHNnX2RtYV9hZGRyZXNzKHNn X2l0ZXIuc2cpICsKQEAgLTIzNzcsNiArMjM4MCw4IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9p bnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkgKi8KIAlJOTE1 X1dSSVRFKEdGWF9GTFNIX0NOVExfR0VONiwgR0ZYX0ZMU0hfQ05UTF9FTik7CiAJUE9TVElOR19S RUFEKEdGWF9GTFNIX0NOVExfR0VONik7CisKKwlhc3NlcnRfcnBtX2F0b21pY19lbmQoZGV2X3By aXYsIHJwbV9hdG9taWNfc2VxKTsKIH0KIAogLyoKQEAgLTIzOTcsNiArMjQwMiw5IEBAIHN0YXRp YyB2b2lkIGdlbjZfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAlpbnQgaSA9IDA7CiAJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwogCWRtYV9h ZGRyX3QgYWRkciA9IDA7CisJaW50IHJwbV9hdG9taWNfc2VxOworCisJcnBtX2F0b21pY19zZXEg PSBhc3NlcnRfcnBtX2F0b21pY19iZWdpbihkZXZfcHJpdik7CiAKIAlmb3JfZWFjaF9zZ19wYWdl KHN0LT5zZ2wsICZzZ19pdGVyLCBzdC0+bmVudHMsIDApIHsKIAkJYWRkciA9IHNnX3BhZ2VfaXRl cl9kbWFfYWRkcmVzcygmc2dfaXRlcik7CkBAIC0yNDIxLDYgKzI0MjksOCBAQCBzdGF0aWMgdm9p ZCBnZW42X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiAJICovCiAJSTkxNV9XUklURShHRlhfRkxTSF9DTlRMX0dFTjYsIEdGWF9GTFNIX0NOVExfRU4p OwogCVBPU1RJTkdfUkVBRChHRlhfRkxTSF9DTlRMX0dFTjYpOworCisJYXNzZXJ0X3JwbV9hdG9t aWNfZW5kKGRldl9wcml2LCBycG1fYXRvbWljX3NlcSk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjhf Z2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKQEAgLTI0MzUs NiArMjQ0NSw5IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJKGdlbjhfcHRlX3QgX19pb21lbSAqKSBkZXZfcHJpdi0+ Z3R0LmdzbSArIGZpcnN0X2VudHJ5OwogCWNvbnN0IGludCBtYXhfZW50cmllcyA9IGd0dF90b3Rh bF9lbnRyaWVzKGRldl9wcml2LT5ndHQpIC0gZmlyc3RfZW50cnk7CiAJaW50IGk7CisJaW50IHJw bV9hdG9taWNfc2VxOworCisJcnBtX2F0b21pY19zZXEgPSBhc3NlcnRfcnBtX2F0b21pY19iZWdp bihkZXZfcHJpdik7CiAKIAlpZiAoV0FSTihudW1fZW50cmllcyA+IG1heF9lbnRyaWVzLAogCQkg IkZpcnN0IGVudHJ5ID0gJWQ7IE51bSBlbnRyaWVzID0gJWQgKG1heD0lZClcbiIsCkBAIC0yNDQ3 LDYgKzI0NjAsOCBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJZm9yIChpID0gMDsgaSA8IG51bV9lbnRyaWVzOyBpKysp CiAJCWdlbjhfc2V0X3B0ZSgmZ3R0X2Jhc2VbaV0sIHNjcmF0Y2hfcHRlKTsKIAlyZWFkbChndHRf YmFzZSk7CisKKwlhc3NlcnRfcnBtX2F0b21pY19lbmQoZGV2X3ByaXYsIHJwbV9hdG9taWNfc2Vx KTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuNl9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLApAQCAtMjQ2MSw2ICsyNDc2LDkgQEAgc3RhdGljIHZvaWQgZ2VuNl9n Z3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkoZ2VuNl9w dGVfdCBfX2lvbWVtICopIGRldl9wcml2LT5ndHQuZ3NtICsgZmlyc3RfZW50cnk7CiAJY29uc3Qg aW50IG1heF9lbnRyaWVzID0gZ3R0X3RvdGFsX2VudHJpZXMoZGV2X3ByaXYtPmd0dCkgLSBmaXJz dF9lbnRyeTsKIAlpbnQgaTsKKwlpbnQgcnBtX2F0b21pY19zZXE7CisKKwlycG1fYXRvbWljX3Nl cSA9IGFzc2VydF9ycG1fYXRvbWljX2JlZ2luKGRldl9wcml2KTsKIAogCWlmIChXQVJOKG51bV9l bnRyaWVzID4gbWF4X2VudHJpZXMsCiAJCSAiRmlyc3QgZW50cnkgPSAlZDsgTnVtIGVudHJpZXMg PSAlZCAobWF4PSVkKVxuIiwKQEAgLTI0NzMsNiArMjQ5MSw4IEBAIHN0YXRpYyB2b2lkIGdlbjZf Z2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlmb3IgKGkg PSAwOyBpIDwgbnVtX2VudHJpZXM7IGkrKykKIAkJaW93cml0ZTMyKHNjcmF0Y2hfcHRlLCAmZ3R0 X2Jhc2VbaV0pOwogCXJlYWRsKGd0dF9iYXNlKTsKKworCWFzc2VydF9ycG1fYXRvbWljX2VuZChk ZXZfcHJpdiwgcnBtX2F0b21pY19zZXEpOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2dndHRfaW5z ZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCkBAIC0yNDgwLDExICsy NTAwLDE3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAogCQkJCSAgICAg ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLCB1MzIgdW51c2VkKQogeworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHZtLT5kZXYtPmRldl9wcml2YXRlOwogCXVu c2lnbmVkIGludCBmbGFncyA9IChjYWNoZV9sZXZlbCA9PSBJOTE1X0NBQ0hFX05PTkUpID8KIAkJ QUdQX1VTRVJfTUVNT1JZIDogQUdQX1VTRVJfQ0FDSEVEX01FTU9SWTsKKwlpbnQgcnBtX2F0b21p Y19zZXE7CisKKwlycG1fYXRvbWljX3NlcSA9IGFzc2VydF9ycG1fYXRvbWljX2JlZ2luKGRldl9w cml2KTsKIAogCWludGVsX2d0dF9pbnNlcnRfc2dfZW50cmllcyhwYWdlcywgc3RhcnQgPj4gUEFH RV9TSElGVCwgZmxhZ3MpOwogCisJYXNzZXJ0X3JwbV9hdG9taWNfZW5kKGRldl9wcml2LCBycG1f YXRvbWljX3NlcSk7CisKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9nZ3R0X2NsZWFyX3JhbmdlKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLApAQCAtMjQ5Miw5ICsyNTE4LDE2IEBAIHN0YXRp YyB2b2lkIGk5MTVfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIAkJCQkgIHVpbnQ2NF90IGxlbmd0aCwKIAkJCQkgIGJvb2wgdW51c2VkKQogeworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHZtLT5kZXYtPmRldl9wcml2YXRlOwogCXVu c2lnbmVkIGZpcnN0X2VudHJ5ID0gc3RhcnQgPj4gUEFHRV9TSElGVDsKIAl1bnNpZ25lZCBudW1f ZW50cmllcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZUOworCWludCBycG1fYXRvbWljX3NlcTsKKwor CXJwbV9hdG9taWNfc2VxID0gYXNzZXJ0X3JwbV9hdG9taWNfYmVnaW4oZGV2X3ByaXYpOworCiAJ aW50ZWxfZ3R0X2NsZWFyX3JhbmdlKGZpcnN0X2VudHJ5LCBudW1fZW50cmllcyk7CisKKwlhc3Nl cnRfcnBtX2F0b21pY19lbmQoZGV2X3ByaXYsIHJwbV9hdG9taWNfc2VxKTsKIH0KIAogc3RhdGlj IGludCBnZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAotLSAKMi41LjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==