From: Dave Gordon Subject: [PATCH v2, 1/4] drm/i915: remove intel_context::file_priv, add flag for default context Date: Wed, 23 Dec 2015 19:33:52 +0000 Message-ID: <1450899235-14463-2-git-send-email-david.s.gordon@intel.com> References: <1450899235-14463-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B1E086E69F for ; Wed, 23 Dec 2015 11:34:08 -0800 (PST) In-Reply-To: <1450899235-14463-1-git-send-email-david.s.gordon@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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org VGhlIGZpbGVfcHJpdiBtZW1iZXIgd2FzIHVzZWQgaW4gb25seSBvbmUgcGxhY2UsIHdoZXJlIHdl IGFscmVhZHkgaGFkCnRoZSBmaWxlX3ByaXYgYW5kIHRoZXJlZm9yZSBkaWRuJ3QgbmVlZCB0byBk ZXJpdmUgaXQgZnJvbSB0aGUgY29udGV4dAooaW4gZmFjdCwgd2UganVzdCBmb3VuZCB0aGUgY29u dGV4dCBieSByZWZlcmVuY2UgdG8gdGhlIGZpbGVfcHJpdikuClNvIGJ5IGZpeGluZyB1cCB0aGF0 IG9uZSB1c2UsIHdlIGNhbiBkcm9wIGZpbGVfcHJpdiBlbnRpcmVseS4KCk9UT0ggc29tZXRpbWVz IHdlIG5lZWQgdG8gaWRlbnRpZnkgdGhlIGdsb2JhbCAoZGVmYXVsdCkgY29udGV4dCwgd2hpY2gK YmVsb25ncyB0byB0aGUgZHJpdmVyIGFzIHdob2xlIGFuZCBpcyBub3QgYXNzb2NpYXRlZCB3aXRo IGFueSB1c2VyIGZpbGUKZGVzY3JpcHRvciwgc28gaGVyZSB3ZSBhZGQgYSBmbGFnIGZvciB0aGF0 IHNwZWNpZmljIHB1cnBvc2UuIFRoaXMgd2lsbAp0aGVuIGJlIHVzZWQgaW5zdGVhZCBvZiB0aGUg Y3VycmVudCB1bnNhZmUgcHJhY3RpY2Ugb2YgY2hlY2sgZWFjaCBlbmdpbmUKdG8gc2VlIHdoZXRo ZXIgaXRzIGRlZmF1bHRfY29udGV4dCBwb2ludGVyIHJlZmVycyBiYWNrIHRvIHRoZSBjb250ZXh0 CmJlaW5nIG9wZXJhdGVkIG9uLiBJbiBhIHN1YnNlcXVlbnQgcGF0Y2gsIHRoZXNlIGJhY2twb2lu dGVycyB3aWxsIGdvCmF3YXkgdG9vIDopCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2 aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggICAgICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4 dC5jIHwgMjIgKysrKysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNl cnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA5 YjgyYzQ1Li40ZmIxNWY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg1NCw2ICs4NTQs NyBAQCBzdHJ1Y3QgaTkxNV9jdHhfaGFuZ19zdGF0cyB7CiAgKiBAcmVmOiByZWZlcmVuY2UgY291 bnQuCiAgKiBAdXNlcl9oYW5kbGU6IHVzZXJzcGFjZSB0cmFja2luZyBpZGVudGl0eSBmb3IgdGhp cyBjb250ZXh0LgogICogQHJlbWFwX3NsaWNlOiBsMyByb3cgcmVtYXBwaW5nIGluZm9ybWF0aW9u LgorICogQGlzX2RlZmF1bHQ6IHRydWUgaWZmIHRoaXMgaXMgdGhlIGdsb2JhbCBkZWZhdWx0IGNv bnRleHQKICAqIEBmbGFnczogY29udGV4dCBzcGVjaWZpYyBmbGFnczoKICAqICAgICAgICAgQ09O VEVYVF9OT19aRVJPTUFQOiBkbyBub3QgYWxsb3cgbWFwcGluZyB0aGluZ3MgdG8gcGFnZSAwLgog ICogQGZpbGVfcHJpdjogZmlscCBhc3NvY2lhdGVkIHdpdGggdGhpcyBjb250ZXh0IChOVUxMIGZv ciBnbG9iYWwgZGVmYXVsdApAQCAtODcyLDkgKzg3Myw5IEBAIHN0cnVjdCBpbnRlbF9jb250ZXh0 IHsKIAlzdHJ1Y3Qga3JlZiByZWY7CiAJaW50IHVzZXJfaGFuZGxlOwogCXVpbnQ4X3QgcmVtYXBf c2xpY2U7CisJdWludDhfdCBpc19nbG9iYWxfZGVmYXVsdDsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNTsKIAlpbnQgZmxhZ3M7Ci0Jc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAq ZmlsZV9wcml2OwogCXN0cnVjdCBpOTE1X2N0eF9oYW5nX3N0YXRzIGhhbmdfc3RhdHM7CiAJc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKaW5kZXggOTAwZmZkMC4uNDM0MzdhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYwpAQCAtMjM2LDE2ICsyMzYsMTcgQEAgX19jcmVhdGVfaHdfY29udGV4 dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCS8qIERlZmF1bHQgY29udGV4dCB3aWxs IG5ldmVyIGhhdmUgYSBmaWxlX3ByaXYgKi8KLQlpZiAoZmlsZV9wcml2ICE9IE5VTEwpIHsKKwlp ZiAoZmlsZV9wcml2ID09IE5VTEwpIHsKKwkJY3R4LT5pc19nbG9iYWxfZGVmYXVsdCA9IHRydWU7 CisJCXJldCA9IERFRkFVTFRfQ09OVEVYVF9IQU5ETEU7CisJfSBlbHNlIHsKIAkJcmV0ID0gaWRy X2FsbG9jKCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyLCBjdHgsCiAJCQkJREVGQVVMVF9DT05URVhU X0hBTkRMRSwgMCwgR0ZQX0tFUk5FTCk7CiAJCWlmIChyZXQgPCAwKQogCQkJZ290byBlcnJfb3V0 OwotCX0gZWxzZQotCQlyZXQgPSBERUZBVUxUX0NPTlRFWFRfSEFORExFOwotCi0JY3R4LT5maWxl X3ByaXYgPSBmaWxlX3ByaXY7CisJfQogCWN0eC0+dXNlcl9oYW5kbGUgPSByZXQ7CisKIAkvKiBO QjogTWFyayBhbGwgc2xpY2VzIGFzIG5lZWRpbmcgYSByZW1hcCBzbyB0aGF0IHdoZW4gdGhlIGNv bnRleHQgZmlyc3QKIAkgKiBsb2FkcyBpdCB3aWxsIHJlc3RvcmUgd2hhdGV2ZXIgcmVtYXAgc3Rh dGUgYWxyZWFkeSBleGlzdHMuIElmIHRoZXJlCiAJICogaXMgbm8gcmVtYXAgaW5mbywgaXQgd2ls bCBiZSBhIE5PUC4gKi8KQEAgLTI2OSw3ICsyNzAsNiBAQCBzdGF0aWMgc3RydWN0IGludGVsX2Nv bnRleHQgKgogaTkxNV9nZW1fY3JlYXRlX2NvbnRleHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkJCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdikKIHsKLQljb25zdCBi b29sIGlzX2dsb2JhbF9kZWZhdWx0X2N0eCA9IGZpbGVfcHJpdiA9PSBOVUxMOwogCXN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHg7CiAJaW50IHJldCA9IDA7CiAKQEAgLTI3OSw4ICsyNzksOSBAQCBp OTE1X2dlbV9jcmVhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChJU19F UlIoY3R4KSkKIAkJcmV0dXJuIGN0eDsKIAotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHggJiYg Y3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkgewotCQkvKiBXZSBtYXkgbmVlZCB0byBkbyB0 aGluZ3Mgd2l0aCB0aGUgc2hyaW5rZXIgd2hpY2gKKwlpZiAoY3R4LT5pc19nbG9iYWxfZGVmYXVs dCAmJiBjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKSB7CisJCS8qCisJCSAqIFdlIG1heSBu ZWVkIHRvIGRvIHRoaW5ncyB3aXRoIHRoZSBzaHJpbmtlciB3aGljaAogCQkgKiByZXF1aXJlIHVz IHRvIGltbWVkaWF0ZWx5IHN3aXRjaCBiYWNrIHRvIHRoZSBkZWZhdWx0CiAJCSAqIGNvbnRleHQu IFRoaXMgY2FuIGNhdXNlIGEgcHJvYmxlbSBhcyBwaW5uaW5nIHRoZQogCQkgKiBkZWZhdWx0IGNv bnRleHQgYWxzbyByZXF1aXJlcyBHVFQgc3BhY2Ugd2hpY2ggbWF5IG5vdApAQCAtMzEzLDcgKzMx NCw3IEBAIGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ cmV0dXJuIGN0eDsKIAogZXJyX3VucGluOgotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHggJiYg Y3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkKKwlpZiAoY3R4LT5pc19nbG9iYWxfZGVmYXVs dCAmJiBjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKQogCQlpOTE1X2dlbV9vYmplY3RfZ2d0 dF91bnBpbihjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKTsKIGVycl9kZXN0cm95OgogCWlk cl9yZW1vdmUoJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIGN0eC0+dXNlcl9oYW5kbGUpOwpAQCAt MzgxLDYgKzM4Miw3IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJfQogCX0KIAorCS8qIE5VTEwgc2Vjb25kIHBhcmFtZXRlciBpbmRpY2F0ZXMg dGhpcyBpcyB0aGUgZ2xvYmFsIGRlZmF1bHQgY29udGV4dCAqLwogCWN0eCA9IGk5MTVfZ2VtX2Ny ZWF0ZV9jb250ZXh0KGRldiwgTlVMTCk7CiAJaWYgKElTX0VSUihjdHgpKSB7CiAJCURSTV9FUlJP UigiRmFpbGVkIHRvIGNyZWF0ZSBkZWZhdWx0IGdsb2JhbCBjb250ZXh0IChlcnJvciAlbGQpXG4i LApAQCAtODk2LDcgKzg5OCw3IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2Rlc3Ryb3lfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJcmV0dXJuIFBUUl9FUlIoY3R4 KTsKIAl9CiAKLQlpZHJfcmVtb3ZlKCZjdHgtPmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIGN0eC0+ dXNlcl9oYW5kbGUpOworCWlkcl9yZW1vdmUoJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIGN0eC0+ dXNlcl9oYW5kbGUpOwogCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4KTsKIAltdXRl eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==