From: yu.dai@intel.com Subject: [PATCH v3 05/15] drm/i915: Defer default hardware context initialisation until first open Date: Fri, 17 Apr 2015 14:21:10 -0700 Message-ID: <1429305680-4990-6-git-send-email-yu.dai@intel.com> References: <1429305680-4990-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 58C4D6EBBF for ; Fri, 17 Apr 2015 14:23:06 -0700 (PDT) In-Reply-To: <1429305680-4990-1-git-send-email-yu.dai@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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCkluIG9yZGVyIHRv IGZ1bGx5IGluaXRpYWxpc2UgdGhlIGRlZmF1bHQgY29udGV4dHMsIHdlIGhhdmUgdG8gZXhlY3V0 ZQpiYXRjaGJ1ZmZlciBjb21tYW5kcyBvbiB0aGUgR1BVIGVuZ2luZXMuIEJ1dCB3ZSBjYW4ndCBk byB0aGF0IHVudGlsIGFueQpyZXF1aXJlZCBmaXJtd2FyZSBoYXMgYmVlbiBsb2FkZWQsIHdoaWNo IG1heSBub3QgYmUgcG9zc2libGUgZHVyaW5nCmRyaXZlciBsb2FkLCBiZWNhdXNlIHRoZSBmaWxl c3lzdGVtKHMpIGNvbnRhaW5pbmcgdGhlIGZpcm13YXJlIG1heSBub3QKYmUgbW91bnRlZCB1bnRp bCBsYXRlci4KClRoZXJlZm9yZSwgd2Ugbm93IGFsbG93IHRoZSBmaXJzdCBjYWxsIHRvIHRoZSBm aXJtd2FyZS1sb2FkaW5nIGNvZGUgdG8KcmV0dXJuIC1FQUdBSU4gdG8gaW5kaWNhdGUgdGhhdCBp dCdzIG5vdCB5ZXQgcmVhZHksIGFuZCB0aGF0IGl0IHNob3VsZApiZSByZXRyaWVkIHdoZW4gdGhl IGRldmljZSBpcyBmaXJzdCBvcGVuZWQgZnJvbSB1c2VyIGNvZGUsIGJ5IHdoaWNoCnRpbWUgd2Ug ZXhwZWN0IHRoYXQgYWxsIHJlcXVpcmVkIGZpbGVzeXN0ZW1zIHdpbGwgaGF2ZSBiZWVuIG1vdW50 ZWQuClRoZSBsYXRlLXJldHJ5IGNvZGUgd2lsbCB0aGVuIHJlLWF0dGVtcHQgdG8gbG9hZCB0aGUg ZmlybXdhcmUgaWYgdGhlCmVhcmx5IGF0dGVtcHQgZmFpbGVkLgoKSXNzdWU6IFZJWi00ODg0ClNp Z25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgICAgICAgICB8ICA5ICsrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jIHwgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgMjUgKysrKysrKysrKysrKysrKysrKysr LS0KIDUgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMzVmYzA4Li5kMTI4YWM0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTE3NjAsNiArMTc2MCw3IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRl IHsKIAkvKiBoZGEvaTkxNSBhdWRpbyBjb21wb25lbnQgKi8KIAlib29sIGF1ZGlvX2NvbXBvbmVu dF9yZWdpc3RlcmVkOwogCisJYm9vbCBjb250ZXh0c19yZWFkeTsKIAl1aW50MzJfdCBod19jb250 ZXh0X3NpemU7CiAJc3RydWN0IGxpc3RfaGVhZCBjb250ZXh0X2xpc3Q7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IDQ0MTU0ZmUuLmI3YmQyODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtNDg4OCw4ICs0ODg4LDE1IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJfQogCisJLyog V2UgY2FuJ3QgZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2FkZWQgKi8K KwlyZXQgPSBpbnRlbF9ndWNfbG9hZF91Y29kZShkZXYsIGZhbHNlKTsKKwlpZiAocmV0ID09IC1F QUdBSU4pCisJCXJldHVybiAwOwkJLyogdG9vIGVhcmx5ICovCisKIAlyZXQgPSBpOTE1X2dlbV9j b250ZXh0X2VuYWJsZShkZXZfcHJpdik7Ci0JaWYgKHJldCAmJiByZXQgIT0gLUVJTykgeworCWlm IChyZXQgPT0gMCkgeworCQlkZXZfcHJpdi0+Y29udGV4dHNfcmVhZHkgPSB0cnVlOworCX0gZWxz ZSBpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCURSTV9FUlJPUigiQ29udGV4dCBlbmFibGUg ZmFpbGVkICVkXG4iLCByZXQpOwogCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGU0YzU3YTMuLjM3 OTVkZjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTQ0Nywy MyArNDQ3LDQ4IEBAIHN0YXRpYyBpbnQgY29udGV4dF9pZHJfY2xlYW51cChpbnQgaWQsIHZvaWQg KnAsIHZvaWQgKmRhdGEpCiAJcmV0dXJuIDA7CiB9CiAKKy8qIENvbXBsZXRlIGFueSBsYXRlIGlu aXRpYWxpc2F0aW9uIGhlcmUgKi8KK3N0YXRpYyBpbnQgaTkxNV9nZW1fY29udGV4dF9maXJzdF9v cGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlpbnQgcmV0OworCisJLyogV2UgY2FuJ3Qg ZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2FkZWQgKi8KKwlyZXQgPSBp bnRlbF9ndWNfbG9hZF91Y29kZShkZXYsIHRydWUpOworCVdBUk5fT04ocmV0ID09IC1FQUdBSU4p OworCisJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFibGUoZGV2X3ByaXYpOworCWlmIChyZXQg PT0gMCkKKwkJZGV2X3ByaXYtPmNvbnRleHRzX3JlYWR5ID0gdHJ1ZTsKKwlyZXR1cm4gcmV0Owor fQorCiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZp bGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7 CisJaW50IHJldCA9IDA7CiAKIAlpZHJfaW5pdCgmZmlsZV9wcml2LT5jb250ZXh0X2lkcik7CiAK IAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JY3R4ID0gaTkxNV9nZW1fY3JlYXRl X2NvbnRleHQoZGV2LCBmaWxlX3ByaXYpOworCisJaWYgKCFkZXZfcHJpdi0+Y29udGV4dHNfcmVh ZHkpCisJCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZmlyc3Rfb3BlbihkZXYpOworCisJaWYgKHJl dCA9PSAwKSB7CisJCWN0eCA9IGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KGRldiwgZmlsZV9wcml2 KTsKKwkJaWYgKElTX0VSUihjdHgpKQorCQkJcmV0ID0gUFRSX0VSUihjdHgpOworCX0KKwogCW11 dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKElTX0VSUihjdHgpKSB7CisJ aWYgKHJldCkKIAkJaWRyX2Rlc3Ryb3koJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIpOwotCQlyZXR1 cm4gUFRSX0VSUihjdHgpOwotCX0KIAotCXJldHVybiAwOworCXJldHVybiByZXQ7CiB9CiAKIHZv aWQgaTkxNV9nZW1fY29udGV4dF9jbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDRmYWZjZWMuLjBh NzMxMjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC05Niw3ICs5Niw3IEBAIHN0cnVj dCBpbnRlbF9ndWMgewogCQkJCSBHVUNfRU5BQkxFX1JFQURfQ0FDSEVfRk9SX1dPUENNX0RBVEEp CiAKIC8qIGludGVsX2d1Y19sb2FkZXIuYyAqLwotZXh0ZXJuIGludCBpbnRlbF9ndWNfbG9hZF91 Y29kZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2V4dGVybiBpbnQgaW50ZWxfZ3VjX2xvYWRf dWNvZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCB3YWl0KTsKIGV4dGVybiB2b2lkIGlu dGVsX2d1Y191Y29kZV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIHZvaWQg aW50ZWxfZ3VjX3Vjb2RlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCBhOTk5MDQ0Li5hMTdmMjEwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC0yNDYsMjQgKzI0Niw0NSBA QCBvdXQ6CiAgKiBpbnRlbF9ndWNfbG9hZF91Y29kZSgpIC0gbG9hZCB1Y29kZSB0byBodwogICoK ICAqIENhbGxlZCBmcm9tIGdlbV9pbml0X2h3KCkgZHVyaW5nIGRyaXZlciBsb2FkaW5nIGFuZCBh bHNvIGFmdGVyIGEgR1BVIHJlc2V0LgorCiAgKiBDaGVjayB0aGF0IHRoZSBmaXJtd2FyZSBmZXRj aGluZyBwcm9jZXNzIGhhcyBzdWNjZWVkZWQsIGFuZCBpZiBzbyB0cmFuc2ZlcgogICogdGhlIGxv YWRlZCBpbWFnZSB0byB0aGUgaGFyZHdhcmUuCisgKgorICogSG93ZXZlciwgdGhlcmUgYXJlIGEg ZmV3IGNoZWNrcyB0byBkbyBmaXJzdC4gVGhlIHZlcnkgZmlyc3QgY2FsbCBzaG91bGQgaGF2ZQor ICogKHdhaXQgPT0gRkFMU0UpLCBidXQgdGhlIGZldGNoX3N0YXRlIHdpbGwgc3RpbGwgYmUgUEVO RElORyBhcyB0aGUgZmlybXdhcmUgbWF5CisgKiBub3QgYmUgYXZhaWxhYmxlIHRoYXQgZWFybHku IFRoZXJlZm9yZSwgb24gdGhpcyBmaXJzdCBjYWxsLCB3ZSBqdXN0IHJldHVybi4KKyAqCisgKiBU aGUgc2Vjb25kIGNhbGwgc2hvdWxkIGNvbWUgZnJvbSB0aGUgZmlyc3Qgb3BlbiBvZiB0aGUgZGV2 aWNlICh3YWl0ID09IFRSVUUpLgorICogVGhpcyBpcyBhIGdvb2QgdGltZSB0byBsb2FkIHRoZSBm aXJtd2FyZSBpbnRvIHRoZSBkZXZpY2UsIGFzIGJ5IHRoaXMgcG9pbnQgaXQKKyAqIG11c3QgYmUg YXZhaWxhYmxlLgorICoKKyAqIEFueSBzdWJzZXF1ZW50IGNhbGxzIGFyZSBleHBlY3RlZCB0byBo YXZlIHdhaXQgPT0gRkFMU0UsIGFuZCBpbmRpY2F0ZSB0aGF0IHRoZQorICogaGFyZHdhcmUgaGFz IGJlZW4gcmVzZXQgYW5kIHNvIHRoZSBmaXJtd2FyZSBzaG91bGQgYmUgcmVsb2FkZWQuCiAgKi8K LWludCBpbnRlbF9ndWNfbG9hZF91Y29kZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IGlu dGVsX2d1Y19sb2FkX3Vjb2RlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgd2FpdCkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwogCWlu dCBlcnI7CiAKKwlpZiAoIUhBU19HVUNfVUNPREUoZGV2KSkKKwkJcmV0dXJuIDA7CisKKwlEUk1f REVCVUdfRFJJVkVSKCJHdUM6IHdhaXQgJWQsIGZldGNoIHN0YXR1cyAlZCwgbG9hZCBzdGF0dXMg JWRcbiIsCisJCXdhaXQsIGd1Y19mdy0+dWNfZndfZmV0Y2hfc3RhdHVzLCBndWNfZnctPnVjX2Z3 X2xvYWRfc3RhdHVzKTsKKworCWlmIChndWNfZnctPnVjX2Z3X2ZldGNoX3N0YXR1cyA9PSBJTlRF TF9VQ19GSVJNV0FSRV9QRU5ESU5HICYmICF3YWl0KQorCQlyZXR1cm4gLUVBR0FJTjsKKwogCWd1 Y19mdy0+dWNfZndfbG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwogCWlmIChn dWNfZnctPnVjX2Z3X2ZldGNoX3N0YXR1cyA9PSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FKQogCQly ZXR1cm4gMDsKIAotCWd1Y19mdy0+dWNfZndfbG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FS RV9QRU5ESU5HOwogCWVyciA9IGludGVsX3VjX2Z3X2NoZWNrKGRldiwgZ3VjX2Z3KTsKIAlpZiAo ZXJyKQogCQlnb3RvIGZhaWw7CiAKKwlndWNfZnctPnVjX2Z3X2xvYWRfc3RhdHVzID0gSU5URUxf VUNfRklSTVdBUkVfUEVORElORzsKIAllcnIgPSBndWNfbG9hZF91Y29kZShkZXYpOwogCWlmIChl cnIpCiAJCWdvdG8gZmFpbDsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=