From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 2/4] drm/i915: mark the global default (intel_)context as such Date: Wed, 16 Dec 2015 18:36:49 +0000 Message-ID: <1450291011-31486-3-git-send-email-david.s.gordon@intel.com> References: <1450291011-31486-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id CA42E6E094 for ; Wed, 16 Dec 2015 10:37:06 -0800 (PST) In-Reply-To: <1450291011-31486-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 List-Id: intel-gfx@lists.freedesktop.org U29tZSBvZiB0aGUgTFJDLXNwZWNpZmljIGNvbnRleHQtZGVzdHJ1Y3Rpb24gY29kZSBoYXMgdG8g c3BlY2lhbC1jYXNlCnRoZSBnbG9iYWwgZGVmYXVsdCBjb250ZXh0LCBiZWNhdXNlIHRoZSBIV1NQ IGlzIHBhcnQgb2YgdGhhdCBjb250ZXh0LiBBdApwcmVzZW50IGl0IGRlZHVjZXMgaXQgaW5kaXJl Y3RseSBieSBjaGVja2luZyBmb3IgdGhlIGJhY2twb2ludGVyIGZyb20KdGhlIGVuZ2luZSB0byB0 aGUgY29udGV4dCwgYnV0IHRoYXQncyBhbiB1bnNhZmUgYXNzdW1wdGlvbiBpZiB0aGUgc2V0dXAK YW5kIHRlYXJkb3duIGNvZGUgaXMgcmVvcmdhbmlzZWQuIChJdCBjb3VsZCBhbHNvIHRlc3QgIWN0 eC0+ZmlsZV9wcml2LApidXQgYWdhaW4gdGhhdCdzIGEgZGV0YWlsIHRoYXQgbWlnaHQgYmUgc3Vi amVjdCB0byBjaGFuZ2UpLgoKU28gaGVyZSB3ZSBleHBsaWNpdGx5IGZsYWcgdGhlIGRlZmF1bHQg Y29udGV4dCBhdCB0aGUgcG9pbnQgb2YgY3JlYXRpb24sCmFuZCB0aGVuIHJlb3JnYW5pc2UgdGhl IGNvZGUgaW4gaW50ZWxfbHJfY29udGV4dF9mcmVlKCkgbm90IHRvIHJlbHkgb24KdGhlIHJpbmct PmRlZmF1bHRfcG9pbnRlciAoc3RpbGwpIGJlaW5nIHNldCB1cDsgdG8gaXRlcmF0ZSBvdmVyIGVu Z2luZXMKaW4gcmV2ZXJzZSAoYXMgdGhpcyBpcyB0ZWFyZG93biBjb2RlKTsgYW5kIHRvIHJlZHVj ZSB0aGUgbmVzdGluZyBsZXZlbApzbyBpdCdzIGVhc2llciB0byByZWFkLgoKU2lnbmVkLW9mZi1i eTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMTIgKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAyNSArKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAz IGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IDkxMjQwODUuLmVhNTk4NDMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtODUxLDYgKzg1MSw3IEBAIHN0cnVjdCBpOTE1X2N0eF9oYW5nX3N0YXRzIHsK ICAqIEByZWY6IHJlZmVyZW5jZSBjb3VudC4KICAqIEB1c2VyX2hhbmRsZTogdXNlcnNwYWNlIHRy YWNraW5nIGlkZW50aXR5IGZvciB0aGlzIGNvbnRleHQuCiAgKiBAcmVtYXBfc2xpY2U6IGwzIHJv dyByZW1hcHBpbmcgaW5mb3JtYXRpb24uCisgKiBAaXNfZGVmYXVsdDogdHJ1ZSBpZmYgdGhpcyBp cyB0aGUgZ2xvYmFsIGRlZmF1bHQgY29udGV4dAogICogQGZsYWdzOiBjb250ZXh0IHNwZWNpZmlj IGZsYWdzOgogICogICAgICAgICBDT05URVhUX05PX1pFUk9NQVA6IGRvIG5vdCBhbGxvdyBtYXBw aW5nIHRoaW5ncyB0byBwYWdlIDAuCiAgKiBAZmlsZV9wcml2OiBmaWxwIGFzc29jaWF0ZWQgd2l0 aCB0aGlzIGNvbnRleHQgKE5VTEwgZm9yIGdsb2JhbCBkZWZhdWx0CkBAIC04NjksNiArODcwLDcg QEAgc3RydWN0IGludGVsX2NvbnRleHQgewogCXN0cnVjdCBrcmVmIHJlZjsKIAlpbnQgdXNlcl9o YW5kbGU7CiAJdWludDhfdCByZW1hcF9zbGljZTsKKwl1aW50OF90IGlzX2dsb2JhbF9kZWZhdWx0 OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1OwogCWludCBmbGFnczsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9jb250ZXh0LmMKaW5kZXggZTE0M2VhNS4uMWYxNjg4MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtMjQxLDggKzI0MSwxMCBAQCBfX2NyZWF0ZV9od19j b250ZXh0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJREVGQVVMVF9DT05URVhUX0hBTkRM RSwgMCwgR0ZQX0tFUk5FTCk7CiAJCWlmIChyZXQgPCAwKQogCQkJZ290byBlcnJfb3V0OwotCX0g ZWxzZQorCX0gZWxzZSB7CisJCWN0eC0+aXNfZ2xvYmFsX2RlZmF1bHQgPSB0cnVlOwogCQlyZXQg PSBERUZBVUxUX0NPTlRFWFRfSEFORExFOworCX0KIAogCWN0eC0+ZmlsZV9wcml2ID0gZmlsZV9w cml2OwogCWN0eC0+dXNlcl9oYW5kbGUgPSByZXQ7CkBAIC0yNjksNyArMjcxLDYgQEAgc3RhdGlj IHN0cnVjdCBpbnRlbF9jb250ZXh0ICoKIGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3By aXYpCiB7Ci0JY29uc3QgYm9vbCBpc19nbG9iYWxfZGVmYXVsdF9jdHggPSBmaWxlX3ByaXYgPT0g TlVMTDsKIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4OwogCWludCByZXQgPSAwOwogCkBAIC0y NzksOCArMjgwLDkgQEAgaTkxNV9nZW1fY3JlYXRlX2NvbnRleHQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAlpZiAoSVNfRVJSKGN0eCkpCiAJCXJldHVybiBjdHg7CiAKLQlpZiAoaXNfZ2xvYmFs X2RlZmF1bHRfY3R4ICYmIGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpIHsKLQkJLyogV2Ug bWF5IG5lZWQgdG8gZG8gdGhpbmdzIHdpdGggdGhlIHNocmlua2VyIHdoaWNoCisJaWYgKGN0eC0+ aXNfZ2xvYmFsX2RlZmF1bHQgJiYgY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkgeworCQkv KgorCQkgKiBXZSBtYXkgbmVlZCB0byBkbyB0aGluZ3Mgd2l0aCB0aGUgc2hyaW5rZXIgd2hpY2gK IAkJICogcmVxdWlyZSB1cyB0byBpbW1lZGlhdGVseSBzd2l0Y2ggYmFjayB0byB0aGUgZGVmYXVs dAogCQkgKiBjb250ZXh0LiBUaGlzIGNhbiBjYXVzZSBhIHByb2JsZW0gYXMgcGlubmluZyB0aGUK IAkJICogZGVmYXVsdCBjb250ZXh0IGFsc28gcmVxdWlyZXMgR1RUIHNwYWNlIHdoaWNoIG1heSBu b3QKQEAgLTMxMyw3ICszMTUsNyBAQCBpOTE1X2dlbV9jcmVhdGVfY29udGV4dChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCXJldHVybiBjdHg7CiAKIGVycl91bnBpbjoKLQlpZiAoaXNfZ2xvYmFs X2RlZmF1bHRfY3R4ICYmIGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpCisJaWYgKGN0eC0+ aXNfZ2xvYmFsX2RlZmF1bHQgJiYgY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkKIAkJaTkx NV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7CiBl cnJfZGVzdHJveToKIAlpZHJfcmVtb3ZlKCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyLCBjdHgtPnVz ZXJfaGFuZGxlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggM2FhNjE0Ny4uMjNmOTBi MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIzNjcsMjIgKzIzNjcsMjEgQEAgdm9p ZCBpbnRlbF9scl9jb250ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKIAlp bnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CisJZm9yIChp ID0gSTkxNV9OVU1fUklOR1M7IC0taSA+PSAwOyApIHsKKwkJc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtpXS5yaW5nYnVmOwogCQlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqY3R4X29iaiA9IGN0eC0+ZW5naW5lW2ldLnN0YXRlOwogCi0JCWlmIChjdHhf b2JqKSB7Ci0JCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9Ci0JCQkJCWN0eC0+ ZW5naW5lW2ldLnJpbmdidWY7Ci0JCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmlu Z2J1Zi0+cmluZzsKKwkJaWYgKCFjdHhfb2JqKQorCQkJY29udGludWU7CiAKLQkJCWlmIChjdHgg PT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KSB7Ci0JCQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9v YmoocmluZ2J1Zik7Ci0JCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7Ci0J CQl9Ci0JCQlXQVJOX09OKGN0eC0+ZW5naW5lW3JpbmctPmlkXS5waW5fY291bnQpOwotCQkJaW50 ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVu Y2UoJmN0eF9vYmotPmJhc2UpOworCQlpZiAoY3R4LT5pc19nbG9iYWxfZGVmYXVsdCkgeworCQkJ aW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CisJCQlpOTE1X2dlbV9vYmplY3Rf Z2d0dF91bnBpbihjdHhfb2JqKTsKIAkJfQorCisJCVdBUk5fT04oY3R4LT5lbmdpbmVbaV0ucGlu X2NvdW50KTsKKwkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOworCQlkcm1fZ2VtX29i amVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJfQogfQogCkBAIC0yNDQzLDcgKzI0 NDIsNyBAQCBzdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKICAqLwogCiBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZl cnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJCSAgICAgc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==