From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 26/73] drm/i915: Store owning file on the i915_address_space Date: Mon, 1 Aug 2016 10:10:34 +0100 Message-ID: <1470042681-25318-27-git-send-email-chris@chris-wilson.co.uk> References: <1470042681-25318-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB55F6E25E for ; Mon, 1 Aug 2016 09:12:06 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x83so25227803wma.3 for ; Mon, 01 Aug 2016 02:12:06 -0700 (PDT) In-Reply-To: <1470042681-25318-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 Rm9yIHRoZSBnbG9iYWwgR1RUIChhbmQgYWxpYXNpbmcgR1RUKSwgdGhlIGFkZHJlc3Mgc3BhY2Ug aXMgb3duZWQgYnkgdGhlCmRldmljZSAoaXQgaXMgYSBnbG9iYWwgcmVzb3VyY2UpIGFuZCBzbyB0 aGUgcGVyLWZpbGUgb3duZXIgZmllbGQgaXMKTlVMTC4gRm9yIHBlci1wcm9jZXNzIEdUVCAod2hl cmUgd2UgY3JlYXRlIGFuIGFkZHJlc3Mgc3BhY2UgcGVyCmNvbnRleHQpLCBlYWNoIGlzIG93bmVk IGJ5IHRoZSBvcGVuaW5nIGZpbGUuIFdlIGNhbiB1c2UgdGhpcyBvd25lcnNoaXAKaW5mb3JtYXRp b24gdG8gYm90aCBkaXN0aW5ndWlzaCBHR1RUIGFuZCBwcEdUVCBhZGRyZXNzIHNwYWNlcywgYXMg d2VsbAphcyBvY2Nhc2lvbmFsbHkgaW5zcGVjdCB0aGUgb3duZXIuCgp2MjogV2hpdGVzcGFjZSwg dGVsbHMgdXMgd2hvIG93bnMgaTkxNV9hZGRyZXNzX3NwYWNlCgpTaWduZWQtb2ZmLWJ5OiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IEpvb25hcyBM YWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyAgICAgfCAzMCArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5oICAgICB8IDE3ICsrKysrKysrKysrLS0tLS0tCiA1IGZpbGVz IGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMDQ0NDQzNzA0ZGI1Li41YjExOTEwMzA3MjMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zNTQsNyArMzU0LDcgQEAgc3RhdGljIGlu dCBwZXJfZmlsZV9zdGF0cyhpbnQgaWQsIHZvaWQgKnB0ciwgdm9pZCAqZGF0YSkKIAkJfSBlbHNl IHsKIAkJCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm1h LT52bSk7CiAKLQkJCWlmIChwcGd0dC0+ZmlsZV9wcml2ICE9IHN0YXRzLT5maWxlX3ByaXYpCisJ CQlpZiAocHBndHQtPmJhc2UuZmlsZSAhPSBzdGF0cy0+ZmlsZV9wcml2KQogCQkJCWNvbnRpbnVl OwogCQl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDliMThiOWM4NzVlYy4uNzQ1MmE0 MDE1OTU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMzMDAsNyArMzMwMCw2IEBAIGk5 MTVfdm1fdG9fcHBndHQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiAJcmV0dXJuIGNv bnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogfQogCi0KIHN0YXRp YyBpbmxpbmUgYm9vbCBpOTE1X2dlbV9vYmpfZ2d0dF9ib3VuZChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqKQogewogCXJldHVybiBpOTE1X2dlbV9vYmpfZ2d0dF9ib3VuZF92aWV3KG9i aiwgJmk5MTVfZ2d0dF92aWV3X25vcm1hbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKaW5kZXggZDdhN2NjOGI2ZmE0Li4yNDM4M2YwZWEzYTQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTMyNyw3ICszMjcsOCBAQCBpOTE1X2dlbV9j cmVhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gY3R4OwogCiAJ aWYgKFVTRVNfRlVMTF9QUEdUVChkZXYpKSB7Ci0JCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCA9IGk5MTVfcHBndHRfY3JlYXRlKGRldiwgZmlsZV9wcml2KTsKKwkJc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0ID0KKwkJCWk5MTVfcHBndHRfY3JlYXRlKHRvX2k5MTUoZGV2KSwgZmlsZV9w cml2KTsKIAogCQlpZiAoSVNfRVJSKHBwZ3R0KSkgewogCQkJRFJNX0RFQlVHX0RSSVZFUigiUFBH VFQgc2V0dXAgZmFpbGVkICglbGQpXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCBiNzZiMDIxM2RhMGMuLmVkYWU1Yzk4NjJhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKQEAgLTIxMDQsMTEgKzIxMDQsMTIgQEAgc3RhdGljIGludCBnZW42X3BwZ3R0X2lu aXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMg aW50IF9faHdfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCitzdGF0aWMgaW50IF9faHdfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCisJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiB7Ci0JcHBndHQtPmJhc2UuZGV2ID0gZGV2OworCXBwZ3R0LT5iYXNlLmRldiA9ICZkZXZfcHJp di0+ZHJtOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOCkKKwlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA8IDgpCiAJCXJldHVybiBnZW42X3BwZ3R0X2luaXQocHBndHQpOwog CWVsc2UKIAkJcmV0dXJuIGdlbjhfcHBndHRfaW5pdChwcGd0dCk7CkBAIC0yMTQzLDE1ICsyMTQ0 LDE3IEBAIHN0YXRpYyB2b2lkIGd0dF93cml0ZV93b3JrYXJvdW5kcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BHUFUsIEdFTjlfTDNfTFJBXzFf R1BHUFVfREVGQVVMVF9WQUxVRV9CWFQpOwogfQogCi1zdGF0aWMgaW50IGk5MTVfcHBndHRfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCitz dGF0aWMgaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJ CQkgICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICBzdHJ1Y3QgZHJt X2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCWludCByZXQgPSAwOworCWludCByZXQ7CiAK LQlyZXQgPSBfX2h3X3BwZ3R0X2luaXQoZGV2LCBwcGd0dCk7CisJcmV0ID0gX19od19wcGd0dF9p bml0KHBwZ3R0LCBkZXZfcHJpdik7CiAJaWYgKHJldCA9PSAwKSB7CiAJCWtyZWZfaW5pdCgmcHBn dHQtPnJlZik7CiAJCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZwcGd0dC0+YmFzZSwgZGV2X3By aXYpOworCQlwcGd0dC0+YmFzZS5maWxlID0gZmlsZV9wcml2OwogCX0KIAogCXJldHVybiByZXQ7 CkBAIC0yMTgzLDcgKzIxODYsOCBAQCBpbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB9CiAKIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICoKLWk5MTVfcHBndHRfY3Jl YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUg KmZwcml2KQoraTkxNV9wcGd0dF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAorCQkgIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZwcml2KQogewogCXN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dDsKIAlpbnQgcmV0OwpAQCAtMjE5MiwxNCArMjE5NiwxMiBA QCBpOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2k5 MTVfZmlsZV9wcml2YXRlICpmcHJpdikKIAlpZiAoIXBwZ3R0KQogCQlyZXR1cm4gRVJSX1BUUigt RU5PTUVNKTsKIAotCXJldCA9IGk5MTVfcHBndHRfaW5pdChkZXYsIHBwZ3R0KTsKKwlyZXQgPSBp OTE1X3BwZ3R0X2luaXQocHBndHQsIGRldl9wcml2LCBmcHJpdik7CiAJaWYgKHJldCkgewogCQlr ZnJlZShwcGd0dCk7CiAJCXJldHVybiBFUlJfUFRSKHJldCk7CiAJfQogCi0JcHBndHQtPmZpbGVf cHJpdiA9IGZwcml2OwotCiAJdHJhY2VfaTkxNV9wcGd0dF9jcmVhdGUoJnBwZ3R0LT5iYXNlKTsK IAogCXJldHVybiBwcGd0dDsKQEAgLTI3ODcsOSArMjc4OSw4IEBAIGludCBpOTE1X2dlbV9pbml0 X2dndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKCFwcGd0dCkKIAkJCXJldHVybiAt RU5PTUVNOwogCi0JCXJldCA9IF9faHdfcHBndHRfaW5pdChkZXYsIHBwZ3R0KTsKKwkJcmV0ID0g X19od19wcGd0dF9pbml0KHBwZ3R0LCBkZXZfcHJpdik7CiAJCWlmIChyZXQpIHsKLQkJCXBwZ3R0 LT5iYXNlLmNsZWFudXAoJnBwZ3R0LT5iYXNlKTsKIAkJCWtmcmVlKHBwZ3R0KTsKIAkJCXJldHVy biByZXQ7CiAJCX0KQEAgLTMyMDAsNyArMzIwMSw2IEBAIGludCBpOTE1X2dndHRfaW5pdF9odyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWdndHQtPmJhc2UuZGV2ID0gZGV2OwotCWdn dHQtPmJhc2UuaXNfZ2d0dCA9IHRydWU7CiAKIAlyZXQgPSBnZ3R0LT5wcm9iZShnZ3R0KTsKIAlp ZiAocmV0KQpAQCAtMzMwNyw3ICszMzA3LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9t YXBwaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCQlzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQ7CiAKLQkJCWlmICh2bS0+aXNfZ2d0dCkKKwkJCWlmIChpOTE1X2lzX2dndHQodm0p KQogCQkJCXBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwogCQkJZWxzZQogCQkJ CXBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oCmluZGV4IGMzNDdlMmEyMmM2NS4uNTI5ZmI0ODNhZmM4IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaApAQCAtMjcyLDEyICsyNzIsMTkgQEAgc3RydWN0IGk5MTVfcG1sNCB7CiBz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKIAlzdHJ1Y3QgZHJtX21tIG1tOwogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXY7CisJLyogRXZlcnkgYWRkcmVzcyBzcGFjZSBiZWxvbmdzIHRvIGEgc3Ry dWN0IGZpbGUgLSBleGNlcHQgZm9yIHRoZSBnbG9iYWwKKwkgKiBHVFQgdGhhdCBpcyBvd25lZCBi eSB0aGUgZHJpdmVyIChhbmQgc28gQGZpbGUgaXMgc2V0IHRvIE5VTEwpLiBJbgorCSAqIHByaW5j aXBsZSwgbm8gaW5mb3JtYXRpb24gc2hvdWxkIGxlYWsgZnJvbSBvbmUgY29udGV4dCB0byBhbm90 aGVyCisJICogKG9yIGJldHdlZW4gZmlsZXMvcHJvY2Vzc2VzIGV0YykgdW5sZXNzIGV4cGxpY2l0 bHkgc2hhcmVkIGJ5IHRoZQorCSAqIG93bmVyLiBUcmFja2luZyB0aGUgb3duZXIgaXMgaW1wb3J0 YW50IGluIG9yZGVyIHRvIGZyZWUgdXAgcGVyLWZpbGUKKwkgKiBvYmplY3RzIGFsb25nIHdpdGgg dGhlIGZpbGUsIHRvIGFpZGUgcmVzb3VyY2UgdHJhY2tpbmcsIGFuZCB0bworCSAqIGFzc2lnbiBi bGFtZS4KKwkgKi8KKwlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlOwogCXN0cnVj dCBsaXN0X2hlYWQgZ2xvYmFsX2xpbms7CiAJdTY0IHN0YXJ0OwkJLyogU3RhcnQgb2Zmc2V0IGFs d2F5cyAwIGZvciBkcmkyICovCiAJdTY0IHRvdGFsOwkJLyogc2l6ZSBhZGRyIHNwYWNlIG1hcHMg KGV4LiAyR0IgZm9yIGdndHQpICovCiAKLQlib29sIGlzX2dndHQ7Ci0KIAlzdHJ1Y3QgaTkxNV9w YWdlX3NjcmF0Y2ggKnNjcmF0Y2hfcGFnZTsKIAlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpzY3Jh dGNoX3B0OwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpzY3JhdGNoX3BkOwpAQCAtMzM4 LDcgKzM0NSw3IEBAIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgewogCQkJdTMyIGZsYWdzKTsK IH07CiAKLSNkZWZpbmUgaTkxNV9pc19nZ3R0KFYpICgoViktPmlzX2dndHQpCisjZGVmaW5lIGk5 MTVfaXNfZ2d0dChWKSAoIShWKS0+ZmlsZSkKIAogLyogVGhlIEdyYXBoaWNzIFRyYW5zbGF0aW9u IFRhYmxlIGlzIHRoZSB3YXkgaW4gd2hpY2ggR0VOIGhhcmR3YXJlIHRyYW5zbGF0ZXMgYQogICog R3JhcGhpY3MgVmlydHVhbCBBZGRyZXNzIGludG8gYSBQaHlzaWNhbCBBZGRyZXNzLiBJbiBhZGRp dGlvbiB0byB0aGUgbm9ybWFsCkBAIC0zODAsOCArMzg3LDYgQEAgc3RydWN0IGk5MTVfaHdfcHBn dHQgewogCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSBwZDsJCS8qIEdFTjYtNyAqLwogCX07 CiAKLQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7Ci0KIAlnZW42X3B0 ZV90IF9faW9tZW0gKnBkX2FkZHI7CiAKIAlpbnQgKCplbmFibGUpKHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCk7CkBAIC01MjgsNyArNTMzLDcgQEAgdm9pZCBpOTE1X2dndHRfY2xlYW51cF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAogaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNlKHN0cnVjdCBrcmVm ICprcmVmKTsKLXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICppOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAorc3RydWN0IGk5MTVfaHdfcHBndHQgKmk5MTVfcHBndHRfY3JlYXRl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJc3RydWN0IGRybV9pOTE1 X2ZpbGVfcHJpdmF0ZSAqZnByaXYpOwogc3RhdGljIGlubGluZSB2b2lkIGk5MTVfcHBndHRfZ2V0 KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsKLS0gCjIuOC4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK