From: Wang Elaine Subject: [PATCH v2 2/2] drm/i915: Check num_pipes before initializing or calling display hooks Date: Mon, 19 Dec 2016 18:19:06 +0800 Message-ID: <1482142746-21663-2-git-send-email-elaine.wang@intel.com> References: <1482142746-21663-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 156586E590 for ; Mon, 19 Dec 2016 10:22:33 +0000 (UTC) In-Reply-To: <1482142746-21663-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 biBkaXNwbGF5IGRvZXNuJ3QgZXhpc3QuIEFkZApjaGVja2luZyBudW1fcGlwZXMgYXQgdGhlIGJl Z2lubmluZyBvZiBpbnRlbF9pbml0X3BtKCkuCgp2MjogTW92ZSBvbmUgY2hlY2sgZnJvbSBjYWxs ZXIgdG8gY2FsbGVlIGZvciBjb25zaXN0ZW5jeS4KCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxp bnV4LmludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IEVsYWluZSBXYW5nIDxlbGFpbmUud2FuZ0BpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDYgKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAxMCArKysrKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWNjNWRiZi4uZTA3OWVhNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTYwMzAsNiArMTYwMzAsOSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9hdG9taWNfc3RhdGVfZnJlZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAg Ki8KIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAw KQorCQlyZXR1cm47CisKIAlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KSB7CiAJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyA9IGhhc3dlbGxfZ2V0X3BpcGVfY29u ZmlnOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcgPQpAQCAt MTY0MTIsNiArMTY0MTUsOSBAQCB2b2lkIGludGVsX21vZGVzZXRfaW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKIAorCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDAp CisJCXJldHVybjsKKwogCWludGVsX3VwZGF0ZV9jZGNsayhkZXZfcHJpdik7CiAKIAlkZXZfcHJp di0+YXRvbWljX2NkY2xrX2ZyZXEgPSBkZXZfcHJpdi0+Y2RjbGtfZnJlcTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCmluZGV4IGQwODM0YjMuLjY0MzhhZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtNzYxOSw3ICs3NjE5LDggQEAgc3RhdGljIHZvaWQgaTgzMF9pbml0X2Nsb2NrX2dhdGlu ZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHZvaWQgaW50ZWxfaW5pdF9j bG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWRldl9w cml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKKwlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPm51bV9waXBlcykKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19n YXRpbmcoZGV2X3ByaXYpOwogfQogCiB2b2lkIGludGVsX3N1c3BlbmRfaHcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNzY0NCw2ICs3NjQ1LDEwIEBAIHN0YXRpYyB2b2lk IG5vcF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAgKi8KIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19nYXRpbmdfaG9va3Moc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogeworCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1f cGlwZXMgPT0gMCkKKwkJcmV0dXJuOworCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKQogCQlk ZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IHNreWxha2VfaW5pdF9jbG9ja19n YXRpbmc7CiAJZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQpAQCAtNzY4NSw2ICs3Njkw LDkgQEAgdm9pZCBpbnRlbF9pbml0X2Nsb2NrX2dhdGluZ19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAvKiBTZXQgdXAgY2hpcCBzcGVjaWZpYyBwb3dlciBtYW5hZ2Vt ZW50LXJlbGF0ZWQgZnVuY3Rpb25zICovCiB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVt X3BpcGVzID09IDApCisJCXJldHVybjsKKwogCWludGVsX2ZiY19pbml0KGRldl9wcml2KTsKIAog CS8qIEZvciBjeHNyICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==