From: Wang Elaine Subject: [PATCH 2/2] drm/i915: Check num_pipes before initializing or calling display hooks Date: Fri, 16 Dec 2016 14:30:31 +0800 Message-ID: <1481869831-1209-2-git-send-email-elaine.wang@intel.com> References: <1481869831-1209-1-git-send-email-elaine.wang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F16E6EB13 for ; Fri, 16 Dec 2016 06:33:51 +0000 (UTC) In-Reply-To: <1481869831-1209-1-git-send-email-elaine.wang@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, elaine.wang@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRWxhaW5lIFdhbmcgPGVsYWluZS53YW5nQGludGVsLmNvbT4KCndoZW4gbnVtX3BpcGVz IGlzIHplcm8sIGl0IGluZGljYXRlcyBkaXNwbGF5IGRvZXNuJ3QgZXhpc3QsIHNvIHRoZXJlCmlz IG5vIG5lZWQgdG8gaW5pdGlhbGl6ZSBkaXNwbGF5IGhvb2tzLiBBbmQgdG8gYXZvaWQgY2FsbGlu ZyB0aGVzZQp1bmluaXRpYWxpemVkIGRpc3BsYXkgaG9va3MsIHJlc3BlY3QgbnVtX3BpcGVzIGF0 IHRoZSBiZWdpbm5pbmcgb2YKaW50ZWxfbW9kZXNldF9pbml0X2h3IGFuZCBpbnRlbF9pbml0X2Ns b2NrX2dhdGluZy4KCmludGVsX2luaXRfcG0oKSBjYWxscyBGQkMgaW5pdCBmdW5jdGlvbiBhbmQg dGhlbiBpbml0aWFsaXplcwp3YXRlciBtYXJrIGhvb2tzLiBCb3RoIGFyZW4ndCBuZWVkZWQgd2hl biBkaXNwbGF5IGRvZXNuJ3QgZXhpc3QuIFNvCmNoZWNrIG51bV9waXBlcyBiZWZvcmUgaW52b2tp bmcgaW50ZWxfaW5pdF9wbSgpLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBFbGFpbmUgV2FuZyA8ZWxhaW5lLndhbmdAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDkgKysrKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCA3ICsrKysrKy0KIDIgZmlsZXMg Y2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWNjNWRiZi4uMjZlY2YwOCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTYwMzAsNiArMTYwMzAsOSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9hdG9taWNfc3RhdGVfZnJlZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAg Ki8KIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAw KQorCQlyZXR1cm47CisKIAlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KSB7CiAJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyA9IGhhc3dlbGxfZ2V0X3BpcGVfY29u ZmlnOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcgPQpAQCAt MTY0MTIsNiArMTY0MTUsOSBAQCB2b2lkIGludGVsX21vZGVzZXRfaW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKIAorCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDAp CisJCXJldHVybjsKKwogCWludGVsX3VwZGF0ZV9jZGNsayhkZXZfcHJpdik7CiAKIAlkZXZfcHJp di0+YXRvbWljX2NkY2xrX2ZyZXEgPSBkZXZfcHJpdi0+Y2RjbGtfZnJlcTsKQEAgLTE2NTI0LDEx ICsxNjUzMCwxMCBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAlpbnRlbF9pbml0X3F1aXJrcyhkZXYpOwogCi0JaW50ZWxfaW5pdF9wbShkZXZfcHJp dik7Ci0KIAlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAwKQogCQlyZXR1 cm4gMDsKIAorCWludGVsX2luaXRfcG0oZGV2X3ByaXYpOwogCS8qCiAJICogVGhlcmUgbWF5IGJl IG5vIFZCVDsgYW5kIGlmIHRoZSBCSU9TIGVuYWJsZWQgU1NDIHdlIGNhbgogCSAqIGp1c3Qga2Vl cCB1c2luZyBpdCB0byBhdm9pZCB1bm5lY2Vzc2FyeSBmbGlja2VyLiAgV2hlcmVhcyBpZiB0aGUK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGQwODM0YjMuLmNmNjZlNTcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtNzYxOSw3ICs3NjE5LDggQEAgc3RhdGljIHZvaWQgaTgzMF9pbml0 X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHZvaWQg aW50ZWxfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogewotCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKKwlp ZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKKwkJZGV2X3ByaXYtPmRpc3BsYXku aW5pdF9jbG9ja19nYXRpbmcoZGV2X3ByaXYpOwogfQogCiB2b2lkIGludGVsX3N1c3BlbmRfaHco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNzY0NCw2ICs3NjQ1LDEwIEBA IHN0YXRpYyB2b2lkIG5vcF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAgKi8KIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19nYXRpbmdfaG9va3Moc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCisJaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5udW1fcGlwZXMgPT0gMCkKKwkJcmV0dXJuOworCiAJaWYgKElTX1NLWUxBS0UoZGV2 X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IHNreWxha2Vf aW5pdF9jbG9ja19nYXRpbmc7CiAJZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=