From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 7/7] drm/i915: check that we are in an RPM atomic section in GGTT PTE updaters Date: Thu, 12 Nov 2015 18:40:21 +0200 Message-ID: <1447346421-29395-8-git-send-email-imre.deak@intel.com> References: <1447346421-29395-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CE51D721F5 for ; Thu, 12 Nov 2015 08:40:46 -0800 (PST) In-Reply-To: <1447346421-29395-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 Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KwogMSBmaWxlIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCmluZGV4IDAxNjczOWUuLmI5Y2QzMzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCkBAIC0yMzU3LDYgKzIzNTcsOSBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRfaW5z ZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJaW50IGkgPSAwOwog CXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKIAlkbWFfYWRkcl90IGFkZHIgPSAwOyAvKiBz aHV0IHVwIGdjYyAqLworCWludCBycG1fYXRvbWljX3NlcTsKKworCXJwbV9hdG9taWNfc2VxID0g YXNzZXJ0X3JwbV9hdG9taWNfYmVnaW4oZGV2X3ByaXYpOwogCiAJZm9yX2VhY2hfc2dfcGFnZShz dC0+c2dsLCAmc2dfaXRlciwgc3QtPm5lbnRzLCAwKSB7CiAJCWFkZHIgPSBzZ19kbWFfYWRkcmVz cyhzZ19pdGVyLnNnKSArCkBAIC0yMzgzLDYgKzIzODYsOCBAQCBzdGF0aWMgdm9pZCBnZW44X2dn dHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJICovCiAJ STkxNV9XUklURShHRlhfRkxTSF9DTlRMX0dFTjYsIEdGWF9GTFNIX0NOVExfRU4pOwogCVBPU1RJ TkdfUkVBRChHRlhfRkxTSF9DTlRMX0dFTjYpOworCisJYXNzZXJ0X3JwbV9hdG9taWNfZW5kKGRl dl9wcml2LCBycG1fYXRvbWljX3NlcSk7CiB9CiAKIC8qCkBAIC0yNDAzLDYgKzI0MDgsOSBAQCBz dGF0aWMgdm9pZCBnZW42X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJaW50IGkgPSAwOwogCXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKIAlk bWFfYWRkcl90IGFkZHIgPSAwOworCWludCBycG1fYXRvbWljX3NlcTsKKworCXJwbV9hdG9taWNf c2VxID0gYXNzZXJ0X3JwbV9hdG9taWNfYmVnaW4oZGV2X3ByaXYpOwogCiAJZm9yX2VhY2hfc2df cGFnZShzdC0+c2dsLCAmc2dfaXRlciwgc3QtPm5lbnRzLCAwKSB7CiAJCWFkZHIgPSBzZ19wYWdl X2l0ZXJfZG1hX2FkZHJlc3MoJnNnX2l0ZXIpOwpAQCAtMjQyNyw2ICsyNDM1LDggQEAgc3RhdGlj IHZvaWQgZ2VuNl9nZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCSAqLwogCUk5MTVfV1JJVEUoR0ZYX0ZMU0hfQ05UTF9HRU42LCBHRlhfRkxTSF9DTlRM X0VOKTsKIAlQT1NUSU5HX1JFQUQoR0ZYX0ZMU0hfQ05UTF9HRU42KTsKKworCWFzc2VydF9ycG1f YXRvbWljX2VuZChkZXZfcHJpdiwgcnBtX2F0b21pY19zZXEpOwogfQogCiBzdGF0aWMgdm9pZCBn ZW44X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCkBAIC0y NDQxLDYgKzI0NTEsOSBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCShnZW44X3B0ZV90IF9faW9tZW0gKikgZGV2X3By aXYtPmd0dC5nc20gKyBmaXJzdF9lbnRyeTsKIAljb25zdCBpbnQgbWF4X2VudHJpZXMgPSBndHRf dG90YWxfZW50cmllcyhkZXZfcHJpdi0+Z3R0KSAtIGZpcnN0X2VudHJ5OwogCWludCBpOworCWlu dCBycG1fYXRvbWljX3NlcTsKKworCXJwbV9hdG9taWNfc2VxID0gYXNzZXJ0X3JwbV9hdG9taWNf YmVnaW4oZGV2X3ByaXYpOwogCiAJaWYgKFdBUk4obnVtX2VudHJpZXMgPiBtYXhfZW50cmllcywK IAkJICJGaXJzdCBlbnRyeSA9ICVkOyBOdW0gZW50cmllcyA9ICVkIChtYXg9JWQpXG4iLApAQCAt MjQ1Myw2ICsyNDY2LDggQEAgc3RhdGljIHZvaWQgZ2VuOF9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCWZvciAoaSA9IDA7IGkgPCBudW1fZW50cmllczsg aSsrKQogCQlnZW44X3NldF9wdGUoJmd0dF9iYXNlW2ldLCBzY3JhdGNoX3B0ZSk7CiAJcmVhZGwo Z3R0X2Jhc2UpOworCisJYXNzZXJ0X3JwbV9hdG9taWNfZW5kKGRldl9wcml2LCBycG1fYXRvbWlj X3NlcSk7CiB9CiAKIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKQEAgLTI0NjcsNiArMjQ4Miw5IEBAIHN0YXRpYyB2b2lkIGdl bjZfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJKGdl bjZfcHRlX3QgX19pb21lbSAqKSBkZXZfcHJpdi0+Z3R0LmdzbSArIGZpcnN0X2VudHJ5OwogCWNv bnN0IGludCBtYXhfZW50cmllcyA9IGd0dF90b3RhbF9lbnRyaWVzKGRldl9wcml2LT5ndHQpIC0g Zmlyc3RfZW50cnk7CiAJaW50IGk7CisJaW50IHJwbV9hdG9taWNfc2VxOworCisJcnBtX2F0b21p Y19zZXEgPSBhc3NlcnRfcnBtX2F0b21pY19iZWdpbihkZXZfcHJpdik7CiAKIAlpZiAoV0FSTihu dW1fZW50cmllcyA+IG1heF9lbnRyaWVzLAogCQkgIkZpcnN0IGVudHJ5ID0gJWQ7IE51bSBlbnRy aWVzID0gJWQgKG1heD0lZClcbiIsCkBAIC0yNDc5LDYgKzI0OTcsOCBAQCBzdGF0aWMgdm9pZCBn ZW42X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJZm9y IChpID0gMDsgaSA8IG51bV9lbnRyaWVzOyBpKyspCiAJCWlvd3JpdGUzMihzY3JhdGNoX3B0ZSwg Jmd0dF9iYXNlW2ldKTsKIAlyZWFkbChndHRfYmFzZSk7CisKKwlhc3NlcnRfcnBtX2F0b21pY19l bmQoZGV2X3ByaXYsIHJwbV9hdG9taWNfc2VxKTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9nZ3R0 X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLApAQCAtMjQ4Niwx MSArMjUwNiwxNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICB1aW50NjRfdCBzdGFydCwKIAkJCQkg ICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwgdTMyIHVudXNlZCkKIHsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsK IAl1bnNpZ25lZCBpbnQgZmxhZ3MgPSAoY2FjaGVfbGV2ZWwgPT0gSTkxNV9DQUNIRV9OT05FKSA/ CiAJCUFHUF9VU0VSX01FTU9SWSA6IEFHUF9VU0VSX0NBQ0hFRF9NRU1PUlk7CisJaW50IHJwbV9h dG9taWNfc2VxOworCisJcnBtX2F0b21pY19zZXEgPSBhc3NlcnRfcnBtX2F0b21pY19iZWdpbihk ZXZfcHJpdik7CiAKIAlpbnRlbF9ndHRfaW5zZXJ0X3NnX2VudHJpZXMocGFnZXMsIHN0YXJ0ID4+ IFBBR0VfU0hJRlQsIGZsYWdzKTsKIAorCWFzc2VydF9ycG1fYXRvbWljX2VuZChkZXZfcHJpdiwg cnBtX2F0b21pY19zZXEpOworCiB9CiAKIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9jbGVhcl9yYW5n ZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKQEAgLTI0OTgsOSArMjUyNCwxNiBAQCBz dGF0aWMgdm9pZCBpOTE1X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJCQkJICB1aW50NjRfdCBsZW5ndGgsCiAJCQkJICBib29sIHVudXNlZCkKIHsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB2bS0+ZGV2LT5kZXZfcHJpdmF0ZTsK IAl1bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0ID4+IFBBR0VfU0hJRlQ7CiAJdW5zaWduZWQg bnVtX2VudHJpZXMgPSBsZW5ndGggPj4gUEFHRV9TSElGVDsKKwlpbnQgcnBtX2F0b21pY19zZXE7 CisKKwlycG1fYXRvbWljX3NlcSA9IGFzc2VydF9ycG1fYXRvbWljX2JlZ2luKGRldl9wcml2KTsK KwogCWludGVsX2d0dF9jbGVhcl9yYW5nZShmaXJzdF9lbnRyeSwgbnVtX2VudHJpZXMpOworCisJ YXNzZXJ0X3JwbV9hdG9taWNfZW5kKGRldl9wcml2LCBycG1fYXRvbWljX3NlcSk7CiB9CiAKIHN0 YXRpYyBpbnQgZ2d0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKLS0gCjIuNS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=