From: Dave Gordon Subject: [PATCH 08/17 v2] drm/i915: Defer default hardware context initialisation until first open Date: Thu, 25 Jun 2015 15:40:04 +0100 Message-ID: <1435243213-22308-9-git-send-email-david.s.gordon@intel.com> References: <1435243213-22308-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 611696EC32 for ; Thu, 25 Jun 2015 07:40:57 -0700 (PDT) In-Reply-To: <1435243213-22308-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 SW4gb3JkZXIgdG8gZnVsbHkgaW5pdGlhbGlzZSB0aGUgZGVmYXVsdCBjb250ZXh0cywgd2UgaGF2 ZSB0byBleGVjdXRlCmJhdGNoYnVmZmVyIGNvbW1hbmRzIG9uIHRoZSBHUFUgZW5naW5lcy4gQnV0 IGluIHRoZSBjYXNlIG9mIEd1Qy1iYXNlZApiYXRjaCBzdWJtaXNzaW9uLCB3ZSBjYW4ndCBkbyB0 aGF0IHVudGlsIGFueSByZXF1aXJlZCBmaXJtd2FyZSBoYXMKYmVlbiBsb2FkZWQsIHdoaWNoIG1h eSBub3QgYmUgcG9zc2libGUgZHVyaW5nIGRyaXZlciBsb2FkLCBiZWNhdXNlIHRoZQpmaWxlc3lz dGVtKHMpIGNvbnRhaW5pbmcgdGhlIGZpcm13YXJlIG1heSBub3QgYmUgbW91bnRlZCB1bnRpbCBs YXRlci4KClRoZXJlZm9yZSwgd2Ugbm93IGFsbG93IHRoZSBmaXJzdCBjYWxsIHRvIHRoZSBmaXJt d2FyZS1sb2FkaW5nIGNvZGUgdG8KcmV0dXJuIC1FQUdBSU4gdG8gaW5kaWNhdGUgdGhhdCBpdCdz IG5vdCB5ZXQgcmVhZHksIGFuZCB0aGF0IGl0IHNob3VsZApiZSByZXRyaWVkIHdoZW4gdGhlIGRl dmljZSBpcyBmaXJzdCBvcGVuZWQgZnJvbSB1c2VyIGNvZGUsIGJ5IHdoaWNoCnRpbWUgd2UgZXhw ZWN0IHRoYXQgYWxsIHJlcXVpcmVkIGZpbGVzeXN0ZW1zIHdpbGwgaGF2ZSBiZWVuIG1vdW50ZWQu ClRoZSBsYXRlLXJldHJ5IGNvZGUgd2lsbCB0aGVuIHJlLWF0dGVtcHQgdG8gbG9hZCB0aGUgZmly bXdhcmUgaWYgdGhlCmVhcmx5IGF0dGVtcHQgZmFpbGVkLgoKSWYgdGhlIGxhdGUgcmV0cnkgZmFp bHMsIHRoZSBjdXJyZW50IG9wZW4taW4tcHJvZ3Jlc3Mgd2lsbCBmYWlsLCBidXQKdGhlIHJlY292 ZXJ5IGNvZGUgd2lsbCBkaXNhYmxlIEd1QyBzdWJtaXNzaW9uIGFuZCByZXNldCB0aGUgR1BVIGFu ZApkcml2ZXIuIFRoZSBuZXh0IG9wZW4gd2lsbCB0aGVyZWZvcmUgYmUgaW4gbm9uLUd1QyBtb2Rl LCBhbmQgd2lsbCBiZQphbGxvd2VkIHRvIGNvbXBsZXRlIGV2ZW4gaWYgdGhlIEd1QyBjYW5ub3Qg YmUgbG9hZGVkIG9yIHVzZWQuCgpJc3N1ZTogVklaLTQ4ODQKU2lnbmVkLW9mZi1ieTogRGF2ZSBH b3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEYWkg PHl1LmRhaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgICAgIHwgICAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAg IHwgICAgOCArKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwg ICA1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jICAgICAgICAgfCAgIDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysK IDQgZmlsZXMgY2hhbmdlZCwgMTA0IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZDBlYTc0ZS4uYzI3NzQzZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0xODQ4LDYgKzE4NDgsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7 CiAJLyogaGRhL2k5MTUgYXVkaW8gY29tcG9uZW50ICovCiAJYm9vbCBhdWRpb19jb21wb25lbnRf cmVnaXN0ZXJlZDsKIAorCWJvb2wgY29udGV4dHNfcmVhZHk7CiAJdWludDMyX3QgaHdfY29udGV4 dF9zaXplOwogCXN0cnVjdCBsaXN0X2hlYWQgY29udGV4dF9saXN0OwogCkBAIC0yNjM3LDYgKzI2 MzgsNyBAQCB2b2lkIGk5MTVfcXVldWVfaGFuZ2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwogX19wcmludGYoMywgNCkKIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgYm9vbCB3ZWRnZWQsCiAJCSAgICAgICBjb25zdCBjaGFyICpmbXQsIC4uLik7Cit2 b2lkIGk5MTVfaGFuZGxlX2d1Y19lcnJvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZXJy KTsKIAogZXh0ZXJuIHZvaWQgaW50ZWxfaXJxX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIGludCBpbnRlbF9pcnFfaW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYjdiMjJlMy4uYTNlNzdk YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC01MTIxLDkgKzUxMjEsMTUgQEAgaTkxNV9n ZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCS8qIFdlIGNhbid0IGVu YWJsZSBjb250ZXh0cyB1bnRpbCBhbGwgZmlybXdhcmUgaXMgbG9hZGVkICovCi0JcmV0ID0gaW50 ZWxfZ3VjX3Vjb2RlX2xvYWQoZGV2LCB0cnVlKTsKKwlyZXQgPSBpbnRlbF9ndWNfdWNvZGVfbG9h ZChkZXYsIGZhbHNlKTsKKwlpZiAocmV0ID09IC1FQUdBSU4pIHsKKwkJcmV0ID0gMDsKKwkJZ290 byBvdXQ7CQkvKiB0b28gZWFybHkgKi8KKwl9CiAKIAlyZXQgPSBpOTE1X2dlbV9pbml0X2h3X2xh dGUoZGV2KTsKKwlpZiAocmV0ID09IDApCisJCWRldl9wcml2LT5jb250ZXh0c19yZWFkeSA9IHRy dWU7CiAKIG91dDoKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VX QUtFX0FMTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggYTdl NThhOC4uZDZmNzRiZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpA QCAtNDM4LDIzICs0MzgsNjUgQEAgc3RhdGljIGludCBjb250ZXh0X2lkcl9jbGVhbnVwKGludCBp ZCwgdm9pZCAqcCwgdm9pZCAqZGF0YSkKIAlyZXR1cm4gMDsKIH0KIAorLyogQ29tcGxldGUgYW55 IGxhdGUgaW5pdGlhbGlzYXRpb24gaGVyZSAqLworc3RhdGljIGludCBpOTE1X2dlbV9jb250ZXh0 X2ZpcnN0X29wZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCWludCByZXQ7CisKKwkvKgor CSAqIFdlIGNhbid0IGVuYWJsZSBjb250ZXh0cyB1bnRpbCBhbGwgZmlybXdhcmUgaXMgbG9hZGVk LiBUaGlzCisJICogY2FsbCBzaG91bGRuJ3QgcmV0dXJuIC1FQUdBSU4gYmVjYXVzZSB3ZSBwYXNz IHdhaXQ9dHJ1ZSwgYnV0CisJICogaXQgY2FuIHN0aWxsIGZhaWwgd2l0aCBjb2RlIC1FSU8gaWYg dGhlIEd1QyBkb2Vzbid0IHJlc3BvbmQsCisJICogb3IgLUVOT0VYRUMgaWYgdGhlIEd1QyBmaXJt d2FyZSBpbWFnZSBpcyBpbnZhbGlkLgorCSAqLworCXJldCA9IGludGVsX2d1Y191Y29kZV9sb2Fk KGRldiwgdHJ1ZSk7CisJV0FSTl9PTihyZXQgPT0gLUVBR0FJTik7CisKKwkvKgorCSAqIElmIGFu IGVycm9yIG9jY3VycmVkIGFuZCBHdUMgc3VibWlzc2lvbiBoYXMgYmVlbiByZXF1ZXN0ZWQsIHdl IGNhbgorCSAqIGF0dGVtcHQgcmVjb3ZlcnkgYnkgZGlzYWJsaW5nIEd1QyBzdWJtaXNzaW9uIGFu ZCByZWluaXRpYWxpc2luZworCSAqIHRoZSBHUFUgYW5kIGRyaXZlci4gV2UgdGhlbiBmYWlsIHRo aXMgb3BlbigpIGFueXdheSwgYnV0IHRoZSBuZXh0CisJICogYXR0ZW1wdCB3aWxsIGZpbmQgdGhh dCBHdUMgc3VibWlzc2lvbiBpcyBhbHJlYWR5IGRpc2FibGVkLCBhbmQgc28KKwkgKiBwcm9jZWVk IHRvIGNvbXBsZXRlIGNvbnRleHQgaW5pdGlhbGlzYXRpb24gaW4gbm9uLUd1QyBtb2RlIGluc3Rl YWQuCisJICovCisJaWYgKHJldCAmJiBpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgeworCQlp OTE1X2hhbmRsZV9ndWNfZXJyb3IoZGV2LCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJl dCA9IGk5MTVfZ2VtX2luaXRfaHdfbGF0ZShkZXYpOworCWlmIChyZXQgPT0gMCkKKwkJZGV2X3By aXYtPmNvbnRleHRzX3JlYWR5ID0gdHJ1ZTsKKwlyZXR1cm4gcmV0OworfQorCiBpbnQgaTkxNV9n ZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAq ZmlsZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUt PmRyaXZlcl9wcml2OwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7CisJaW50IHJldCA9IDA7 CiAKIAlpZHJfaW5pdCgmZmlsZV9wcml2LT5jb250ZXh0X2lkcik7CiAKIAltdXRleF9sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7Ci0JY3R4ID0gaTkxNV9nZW1fY3JlYXRlX2NvbnRleHQoZGV2LCBm aWxlX3ByaXYpOworCisJaWYgKCFkZXZfcHJpdi0+Y29udGV4dHNfcmVhZHkpCisJCXJldCA9IGk5 MTVfZ2VtX2NvbnRleHRfZmlyc3Rfb3BlbihkZXYpOworCisJaWYgKHJldCA9PSAwKSB7CisJCWN0 eCA9IGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KGRldiwgZmlsZV9wcml2KTsKKwkJaWYgKElTX0VS UihjdHgpKQorCQkJcmV0ID0gUFRSX0VSUihjdHgpOworCX0KKwogCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKElTX0VSUihjdHgpKSB7CisJaWYgKHJldCkKIAkJaWRy X2Rlc3Ryb3koJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIpOwotCQlyZXR1cm4gUFRSX0VSUihjdHgp OwotCX0KIAotCXJldHVybiAwOworCXJldHVybiByZXQ7CiB9CiAKIHZvaWQgaTkxNV9nZW1fY29u dGV4dF9jbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUp CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBhNmZiZTY0Li44MjE5MmZmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKQEAgLTIzNzQsNiArMjM3NCw1NCBAQCB2b2lkIGk5MTVfaGFuZGxlX2Vy cm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgd2VkZ2VkLAogCWk5MTVfcmVzZXRfYW5k X3dha2V1cChkZXYpOwogfQogCisvKioKKyAqIGk5MTVfaGFuZGxlX2Vycm9yIC0gaGFuZGxlIGEg R3VDIGVycm9yCisgKiBAZGV2OiBkcm0gZGV2aWNlCisgKgorICogSWYgdGhlIEd1QyBjYW4ndCBi ZSAocmUtKWluaXRpYWxpc2VkLCBkaXNhYmxlIEd1QyBzdWJtaXNzaW9uIGFuZAorICogdGhlbiBy ZXNldCBhbmQgcmVpbml0aWFsaXNlIHRoZSByZXN0IG9mIHRoZSBHUFUsIHNvIHRoYXQgd2UgY2Fu CisgKiBmYWxsIGJhY2sgdG8gb3BlcmF0aW5nIGluIEVMU1AgbW9kZS4gRG9uJ3QgYm90aGVyIGNh cHR1cmluZyBlcnJvcgorICogc3RhdGUsIGJlY2F1c2UgaXQgcHJvYmFibHkgaXNuJ3QgcmVsZXZh bnQgaGVyZS4KKyAqCisgKiBVbmxpa2UgaTkxNV9oYW5kbGVfZXJyb3IoKSBhYm92ZSwgdGhpcyBp cyBjYWxsZWQgd2l0aCB0aGUgZ2xvYmFsCisgKiBzdHJ1Y3RfbXV0ZXggaGVsZCwgc28gd2UgbmVl ZCB0byByZWxlYXNlIGl0IGFmdGVyIHNldHRpbmcgdGhlCisgKiByZXNldC1pbi1wcm9ncmVzcyBi aXQgc28gdGhhdCBvdGhlciB0aHJlYWRzIGNhbiBtYWtlIHByb2dyZXNzLAorICogYW5kIHJlYWNx dWlyZSBpdCBhZnRlciB0aGUgcmVzZXQgaXMgY29tcGxldGUuCisgKi8KK3ZvaWQgaTkxNV9oYW5k bGVfZ3VjX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBlcnIpCit7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKworCURSTV9F UlJPUigiR3VDIGZhaWx1cmUgJWQsIGRpc2FibGluZyBHdUMgc3VibWlzc2lvblxuIiwgZXJyKTsK KwlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IGZhbHNlOworCisJaTkxNV9yZXBvcnRfYW5k X2NsZWFyX2VpcihkZXYpOwkvKiB1bmxpa2VseT8gKi8KKworCWF0b21pY19zZXRfbWFzayhJOTE1 X1JFU0VUX0lOX1BST0dSRVNTX0ZMQUcsCisJCQkmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9j b3VudGVyKTsKKworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCisJLyoKKwkg KiBXYWtldXAgd2FpdGluZyBwcm9jZXNzZXMgc28gdGhhdCB0aGUgcmVzZXQgZnVuY3Rpb24KKwkg KiBpOTE1X3Jlc2V0X2FuZF93YWtldXAgZG9lc24ndCBkZWFkbG9jayB0cnlpbmcgdG8gZ3JhYgor CSAqIHZhcmlvdXMgbG9ja3MuIEJ5IGJ1bXBpbmcgdGhlIHJlc2V0IGNvdW50ZXIgZmlyc3QsIHRo ZSB3b2tlbgorCSAqIHByb2Nlc3NlcyB3aWxsIHNlZSBhIHJlc2V0IGluIHByb2dyZXNzIGFuZCBi YWNrIG9mZiwKKwkgKiByZWxlYXNpbmcgdGhlaXIgbG9ja3MgYW5kIHRoZW4gd2FpdCBmb3IgdGhl IHJlc2V0IGNvbXBsZXRpb24uCisJICogV2UgbXVzdCBkbyB0aGlzIGZvciBfYWxsXyBncHUgd2Fp dGVycyB0aGF0IG1pZ2h0IGhvbGQgbG9ja3MKKwkgKiB0aGF0IHRoZSByZXNldCB3b3JrIG5lZWRz IHRvIGFjcXVpcmUuCisJICoKKwkgKiBOb3RlOiBUaGUgd2FrZV91cCBzZXJ2ZXMgYXMgdGhlIHJl cXVpcmVkIG1lbW9yeSBiYXJyaWVyIHRvCisJICogZW5zdXJlIHRoYXQgdGhlIHdhaXRlcnMgc2Vl IHRoZSB1cGRhdGVkIHZhbHVlIG9mIHRoZSByZXNldAorCSAqIGNvdW50ZXIgYXRvbWljX3QuCisJ ICovCisJaTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2LCBmYWxzZSk7CisKKwlpOTE1X3Jlc2V0 X2FuZF93YWtldXAoZGV2KTsKKworCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKK30K KwogLyogQ2FsbGVkIGZyb20gZHJtIGdlbmVyaWMgY29kZSwgcGFzc2VkICdjcnRjJyB3aGljaAog ICogd2UgdXNlIGFzIGEgcGlwZSBpbmRleAogICovCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=