From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 103/190] drm/i915: Move pinning of dev_priv->kernel_context into its creator Date: Mon, 11 Jan 2016 10:44:47 +0000 Message-ID: <1452509174-16671-17-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4E2A6E1ED for ; Mon, 11 Jan 2016 02:46:45 -0800 (PST) Received: by mail-wm0-f68.google.com with SMTP id u188so25621773wmu.0 for ; Mon, 11 Jan 2016 02:46:45 -0800 (PST) In-Reply-To: <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> 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 UmF0aGVyIHRoYW4gaGF2ZSBldmVyeSBjb250ZXh0IGFzayAiYW0gSSBvd25lZCBieSB0aGUga2Vy bmVsPyBwaW4hIiwKbW92ZSB0aGF0IGxvZ2ljIGludG8gdGhlIGNyZWF0b3Igb2YgdGhlIGtlcm5l bCBjb250ZXh0LCBpbiBvcmRlciB0bwppbXByb3ZlIGNvZGUgY29tcHJlaGVuc2lvbi4KClNpZ25l ZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8IDUzICsrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDI5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRl eCA1OTNjMjJhNzAyZmEuLmI3ZjU3ODFhODVlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYwpAQCAtMjgwLDkgKzI4MCw3IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqCiBpOTE1X2dlbV9jcmVhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQkJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2KQogewotCWNvbnN0IGJv b2wgaXNfZ2xvYmFsX2RlZmF1bHRfY3R4ID0gZmlsZV9wcml2ID09IE5VTEw7CiAJc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eDsKLQlpbnQgcmV0ID0gMDsKIAogCUJVR19PTighbXV0ZXhfaXNfbG9j a2VkKCZkZXYtPnN0cnVjdF9tdXRleCkpOwogCkBAIC0yOTAsMzEgKzI4OCwxNSBAQCBpOTE1X2dl bV9jcmVhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChJU19FUlIoY3R4 KSkKIAkJcmV0dXJuIGN0eDsKIAotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHggJiYgY3R4LT5s ZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkgewotCQkvKiBXZSBtYXkgbmVlZCB0byBkbyB0aGluZ3Mg d2l0aCB0aGUgc2hyaW5rZXIgd2hpY2gKLQkJICogcmVxdWlyZSB1cyB0byBpbW1lZGlhdGVseSBz d2l0Y2ggYmFjayB0byB0aGUgZGVmYXVsdAotCQkgKiBjb250ZXh0LiBUaGlzIGNhbiBjYXVzZSBh IHByb2JsZW0gYXMgcGlubmluZyB0aGUKLQkJICogZGVmYXVsdCBjb250ZXh0IGFsc28gcmVxdWly ZXMgR1RUIHNwYWNlIHdoaWNoIG1heSBub3QKLQkJICogYmUgYXZhaWxhYmxlLiBUbyBhdm9pZCB0 aGlzIHdlIGFsd2F5cyBwaW4gdGhlIGRlZmF1bHQKLQkJICogY29udGV4dC4KLQkJICovCi0JCXJl dCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLAot CQkJCQkgICAgZ2V0X2NvbnRleHRfYWxpZ25tZW50KGRldiksIDApOwotCQlpZiAocmV0KSB7Ci0J CQlEUk1fREVCVUdfRFJJVkVSKCJDb3VsZG4ndCBwaW4gJWRcbiIsIHJldCk7Ci0JCQlnb3RvIGVy cl9kZXN0cm95OwotCQl9Ci0JfQotCiAJaWYgKFVTRVNfRlVMTF9QUEdUVChkZXYpKSB7CiAJCXN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCQlpOTE1X3BwZ3R0X2NyZWF0ZSh0b19pOTE1 KGRldiksIGZpbGVfcHJpdik7CiAKLQkJaWYgKElTX0VSUl9PUl9OVUxMKHBwZ3R0KSkgeworCQlp ZiAoSVNfRVJSKHBwZ3R0KSkgewogCQkJRFJNX0RFQlVHX0RSSVZFUigiUFBHVFQgc2V0dXAgZmFp bGVkICglbGQpXG4iLAogCQkJCQkgUFRSX0VSUihwcGd0dCkpOwotCQkJcmV0ID0gUFRSX0VSUihw cGd0dCk7Ci0JCQlnb3RvIGVycl91bnBpbjsKKwkJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVu Y2UoY3R4KTsKKwkJCXJldHVybiBFUlJfQ0FTVChwcGd0dCk7CiAJCX0KIAogCQljdHgtPnBwZ3R0 ID0gcHBndHQ7CkBAIC0zMjMsMTQgKzMwNSw2IEBAIGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJdHJhY2VfaTkxNV9jb250ZXh0X2NyZWF0ZShjdHgpOwog CiAJcmV0dXJuIGN0eDsKLQotZXJyX3VucGluOgotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgg JiYgY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkKLQkJaTkxNV9nZW1fb2JqZWN0X2dndHRf dW5waW4oY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7Ci1lcnJfZGVzdHJveToKLQlpZHJf cmVtb3ZlKCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyLCBjdHgtPnVzZXJfaGFuZGxlKTsKLQljb250 ZXh0X2Nsb3NlKGN0eCk7Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KIAogdm9pZCBpOTE1X2dl bV9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC00MDIsNiArMzc2LDI3 IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ CSAgUFRSX0VSUihjdHgpKTsKIAkJcmV0dXJuIFBUUl9FUlIoY3R4KTsKIAl9CisKKwlpZiAoY3R4 LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkgeworCQlpbnQgcmV0OworCisJCS8qIFdlIG1heSBu ZWVkIHRvIGRvIHRoaW5ncyB3aXRoIHRoZSBzaHJpbmtlciB3aGljaAorCQkgKiByZXF1aXJlIHVz IHRvIGltbWVkaWF0ZWx5IHN3aXRjaCBiYWNrIHRvIHRoZSBkZWZhdWx0CisJCSAqIGNvbnRleHQu IFRoaXMgY2FuIGNhdXNlIGEgcHJvYmxlbSBhcyBwaW5uaW5nIHRoZQorCQkgKiBkZWZhdWx0IGNv bnRleHQgYWxzbyByZXF1aXJlcyBHVFQgc3BhY2Ugd2hpY2ggbWF5IG5vdAorCQkgKiBiZSBhdmFp bGFibGUuIFRvIGF2b2lkIHRoaXMgd2UgYWx3YXlzIHBpbiB0aGUgZGVmYXVsdAorCQkgKiBjb250 ZXh0LgorCQkgKi8KKwkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eC0+bGVnYWN5X2h3 X2N0eC5yY3Nfc3RhdGUsCisJCQkJCSAgICBnZXRfY29udGV4dF9hbGlnbm1lbnQoZGV2KSwgMCk7 CisJCWlmIChyZXQpIHsKKwkJCURSTV9FUlJPUigiRmFpbGVkIHRvIHBpbm5lZCBkZWZhdWx0IGds b2JhbCBjb250ZXh0IChlcnJvciAlZClcbiIsCisJCQkJICByZXQpOworCQkJaTkxNV9nZW1fY29u dGV4dF91bnJlZmVyZW5jZShjdHgpOworCQkJcmV0dXJuIHJldDsKKwkJfQorCX0KKwogCWRldl9w cml2LT5rZXJuZWxfY29udGV4dCA9IGN0eDsKIAogCURSTV9ERUJVR19EUklWRVIoIiVzIGNvbnRl eHQgc3VwcG9ydCBpbml0aWFsaXplZFxuIiwKLS0gCjIuNy4wLnJjMwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK