From mboxrd@z Thu Jan 1 00:00:00 1970 From: robert.foss@collabora.com Subject: [PATCH i-g-t v6 2/7] lib/igt_kms: Fix plane counting in igt_display_init. Date: Wed, 18 May 2016 20:07:04 -0400 Message-ID: <1463616429-13079-3-git-send-email-robert.foss@collabora.com> References: <1463616429-13079-1-git-send-email-robert.foss@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93AA56E16E for ; Thu, 19 May 2016 00:07:23 +0000 (UTC) In-Reply-To: <1463616429-13079-1-git-send-email-robert.foss@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com, marius.c.vlad@intel.com, ville.syrjala@linux.intel.com, jani.nikula@intel.com, chris@chris-wilson.co.uk Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUm9iZXJ0IEZvc3MgPHJvYmVydC5mb3NzQGNvbGxhYm9yYS5jb20+CgpGaXggaXNzdWUg d2hlcmUgdGhlIHBsYW5lIGNvdW50aW5nIGZhaWxzIGR1ZSB0byB0aGUgbnVtYmVyIGFuZApjb25m aWd1cmF0aW9uIG9mIHBsYW5lcyBiZWluZyB1bmxpa2UgdGhlIGludGVsIGNvbmZpZ3VyYXRpb24u CgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgRm9zcyA8cm9iZXJ0LmZvc3NAY29sbGFib3JhLmNvbT4K LS0tCiBsaWIvaWd0X2ttcy5jIHwgNiArKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuYyBiL2xpYi9p Z3Rfa21zLmMKaW5kZXggN2U2M2RkYy4uMWRjMjUyMSAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMu YworKysgYi9saWIvaWd0X2ttcy5jCkBAIC0xMjg5LDYgKzEyODksNyBAQCB2b2lkIGlndF9kaXNw bGF5X2luaXQoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgaW50IGRybV9mZCkKIAkJaWd0X3BsYW5l X3QgKnBsYW5lOwogCQlpbnQgcCA9IElHVF9QTEFORV8yOwogCQlpbnQgaiwgdHlwZTsKKwkJdWlu dDhfdCBuX3BsYW5lcyA9IDA7CiAKIAkJcGlwZS0+Y3J0Y19pZCA9IHJlc291cmNlcy0+Y3J0Y3Nb aV07CiAJCXBpcGUtPmRpc3BsYXkgPSBkaXNwbGF5OwpAQCAtMTMzNiw4ICsxMzM3LDEwIEBAIHZv aWQgaWd0X2Rpc3BsYXlfaW5pdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgZHJtX2ZkKQog CQkJCWJyZWFrOwogCQkJfQogCisJCQluX3BsYW5lcysrOwogCQkJcGxhbmUtPnBpcGUgPSBwaXBl OwogCQkJcGxhbmUtPmRybV9wbGFuZSA9IGRybV9wbGFuZTsKKwogCQkJaWYgKGlzX2F0b21pYyA9 PSAwKSB7CiAJCQkJZGlzcGxheS0+aXNfYXRvbWljID0gMTsKIAkJCQlpZ3RfYXRvbWljX2ZpbGxf cGxhbmVfcHJvcHMoZGlzcGxheSwgcGxhbmUsIElHVF9OVU1fUExBTkVfUFJPUFMsIGlndF9wbGFu ZV9wcm9wX25hbWVzKTsKQEAgLTEzODYsOCArMTM4OSw3IEBAIHZvaWQgaWd0X2Rpc3BsYXlfaW5p dChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgZHJtX2ZkKQogCQkJcGxhbmUtPmlzX2N1cnNv ciA9IHRydWU7CiAJCX0KIAotCQkvKiBwbGFuZXMgPSAxIHByaW1hcnksIChwLTEpIHNwcml0ZXMs IDEgY3Vyc29yICovCi0JCXBpcGUtPm5fcGxhbmVzID0gcCArIDE7CisJCXBpcGUtPm5fcGxhbmVz ID0gbl9wbGFuZXM7CiAKIAkJLyogbWFrZSBzdXJlIHdlIGRvbid0IG92ZXJmbG93IHRoZSBwbGFu ZSBhcnJheSAqLwogCQlpZ3RfYXNzZXJ0KHBpcGUtPm5fcGxhbmVzIDw9IElHVF9NQVhfUExBTkVT KTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK