From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH i-g-t v2 08/15] igt_kms: Remove pan members from igt_plane, v2. Date: Wed, 6 Jul 2016 11:55:48 +0200 Message-ID: <1467798955-7324-9-git-send-email-maarten.lankhorst@linux.intel.com> References: <1467798955-7324-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDBC46E609 for ; Wed, 6 Jul 2016 09:56:02 +0000 (UTC) In-Reply-To: <1467798955-7324-1-git-send-email-maarten.lankhorst@linux.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 VGhleSdyZSBkdXBsaWNhdGVzIHdpdGggc3JjX3gveSwgc28ganVzdCB1c2UgdGhvc2UuCgpDaGFu Z2VzIHNpbmNlIHYxOgotIEZpeCBvcmRlciBvZiBwYXJhbWV0ZXJzIGluIGNhbGxzIHRvIGlndF9m Yl9zZXRfcG9zaXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGxpYi9pZ3Rfa21zLmMgICAgICAgICAg ICAgfCAyNCArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGxpYi9pZ3Rfa21zLmggICAgICAgICAg ICAgfCAgNCAtLS0tCiB0ZXN0cy9rbXNfcGFuZWxfZml0dGluZy5jIHwgIDIgKy0KIHRlc3RzL2tt c19wbGFuZS5jICAgICAgICAgfCAgOCArKystLS0tLQogdGVzdHMva21zX3BsYW5lX3NjYWxpbmcu YyB8ICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuYyBiL2xpYi9pZ3Rfa21zLmMKaW5kZXggOGM3 NTk4YTg4YTY5Li45ZmM1NTU5YTVkZjQgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21zLmMKKysrIGIv bGliL2lndF9rbXMuYwpAQCAtMTkxNSw3ICsxOTE1LDcgQEAgc3RhdGljIGludCBpZ3RfcHJpbWFy eV9wbGFuZV9jb21taXRfbGVnYWN5KGlndF9wbGFuZV90ICpwcmltYXJ5LAogCWlndF9hc3NlcnQo IXByaW1hcnktPnJvdGF0aW9uX2NoYW5nZWQpOwogCiAJaWYgKCFwcmltYXJ5LT5mYl9jaGFuZ2Vk ICYmICFwcmltYXJ5LT5wb3NpdGlvbl9jaGFuZ2VkICYmCi0JCSFwcmltYXJ5LT5zaXplX2NoYW5n ZWQgJiYgIXByaW1hcnktPnBhbm5pbmdfY2hhbmdlZCkKKwkJIXByaW1hcnktPnNpemVfY2hhbmdl ZCkKIAkJcmV0dXJuIDA7CiAKIAljcnRjX2lkID0gcGlwZS0+Y3J0Y19pZDsKQEAgLTE5MjcsMTgg KzE5MjcsMTggQEAgc3RhdGljIGludCBpZ3RfcHJpbWFyeV9wbGFuZV9jb21taXRfbGVnYWN5KGln dF9wbGFuZV90ICpwcmltYXJ5LAogCiAJaWYgKGZiX2lkKSB7CiAJCUxPRyhkaXNwbGF5LAotCQkg ICAgIiVzOiBTZXRDcnRjIHBpcGUgJXMsIGZiICV1LCBwYW5uaW5nICglZCwgJWQpLCAiCisJCSAg ICAiJXM6IFNldENydGMgcGlwZSAlcywgZmIgJXUsIHNyYyAoJWQsICVkKSwgIgogCQkgICAgIm1v ZGUgJWR4JWRcbiIsCiAJCSAgICBpZ3Rfb3V0cHV0X25hbWUob3V0cHV0KSwKIAkJICAgIGttc3Rl c3RfcGlwZV9uYW1lKHBpcGUtPnBpcGUpLAogCQkgICAgZmJfaWQsCi0JCSAgICBwcmltYXJ5LT5w YW5feCwgcHJpbWFyeS0+cGFuX3ksCisJCSAgICBwcmltYXJ5LT5zcmNfeCwgcHJpbWFyeS0+c3Jj X3gsCiAJCSAgICBtb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXkpOwogCiAJCXJldCA9IGRy bU1vZGVTZXRDcnRjKGRpc3BsYXktPmRybV9mZCwKIAkJCQkgICAgIGNydGNfaWQsCiAJCQkJICAg ICBmYl9pZCwKLQkJCQkgICAgIHByaW1hcnktPnBhbl94LCBwcmltYXJ5LT5wYW5feSwKKwkJCQkg ICAgIHByaW1hcnktPnNyY194LCBwcmltYXJ5LT5zcmNfeCwKIAkJCQkgICAgICZvdXRwdXQtPmlk LAogCQkJCSAgICAgMSwKIAkJCQkgICAgIG1vZGUpOwpAQCAtMTk2Miw3ICsxOTYyLDYgQEAgc3Rh dGljIGludCBpZ3RfcHJpbWFyeV9wbGFuZV9jb21taXRfbGVnYWN5KGlndF9wbGFuZV90ICpwcmlt YXJ5LAogCXByaW1hcnktPmZiX2NoYW5nZWQgPSBmYWxzZTsKIAlwcmltYXJ5LT5wb3NpdGlvbl9j aGFuZ2VkID0gZmFsc2U7CiAJcHJpbWFyeS0+c2l6ZV9jaGFuZ2VkID0gZmFsc2U7Ci0JcHJpbWFy eS0+cGFubmluZ19jaGFuZ2VkID0gZmFsc2U7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTI0MDgsMjEg KzI0MDcsNiBAQCB2b2lkIGlndF9mYl9zZXRfc2l6ZShzdHJ1Y3QgaWd0X2ZiICpmYiwgaWd0X3Bs YW5lX3QgKnBsYW5lLAogCXBsYW5lLT5mYl9jaGFuZ2VkID0gdHJ1ZTsKIH0KIAotdm9pZCBpZ3Rf cGxhbmVfc2V0X3Bhbm5pbmcoaWd0X3BsYW5lX3QgKnBsYW5lLCBpbnQgeCwgaW50IHkpCi17Ci0J aWd0X3BpcGVfdCAqcGlwZSA9IHBsYW5lLT5waXBlOwotCWlndF9kaXNwbGF5X3QgKmRpc3BsYXkg PSBwaXBlLT5kaXNwbGF5OwotCi0JTE9HKGRpc3BsYXksICIlcy4lZDogcGxhbmVfc2V0X3Bhbm5p bmcoJWQsJWQpXG4iLAotCSAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlLT5waXBlKSwKLQkgICAg cGxhbmUtPmluZGV4LCB4LCB5KTsKLQotCXBsYW5lLT5wYW5feCA9IHg7Ci0JcGxhbmUtPnBhbl95 ID0geTsKLQotCXBsYW5lLT5wYW5uaW5nX2NoYW5nZWQgPSB0cnVlOwotfQotCiBzdGF0aWMgY29u c3QgY2hhciAqcm90YXRpb25fbmFtZShpZ3Rfcm90YXRpb25fdCByb3RhdGlvbikKIHsKIAlzd2l0 Y2ggKHJvdGF0aW9uKSB7CmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5oIGIvbGliL2lndF9rbXMu aAppbmRleCBiOWU4ZDM0NGVkOGMuLjRkMThjMDEwNDJjOSAxMDA2NDQKLS0tIGEvbGliL2lndF9r bXMuaAorKysgYi9saWIvaWd0X2ttcy5oCkBAIC0yMjAsNyArMjIwLDYgQEAgdHlwZWRlZiBzdHJ1 Y3QgewogCS8qIHN0YXRlIHRyYWNraW5nICovCiAJdW5zaWduZWQgaW50IGZiX2NoYW5nZWQgICAg ICAgOiAxOwogCXVuc2lnbmVkIGludCBwb3NpdGlvbl9jaGFuZ2VkIDogMTsKLQl1bnNpZ25lZCBp bnQgcGFubmluZ19jaGFuZ2VkICA6IDE7CiAJdW5zaWduZWQgaW50IHJvdGF0aW9uX2NoYW5nZWQg OiAxOwogCXVuc2lnbmVkIGludCBzaXplX2NoYW5nZWQgICAgIDogMTsKIAkvKgpAQCAtMjQ0LDgg KzI0Myw2IEBAIHR5cGVkZWYgc3RydWN0IHsKIAl1aW50MzJfdCBzcmNfdzsKIAl1aW50MzJfdCBz cmNfaDsKIAotCS8qIHBhbm5pbmcgb2Zmc2V0IHdpdGhpbiB0aGUgZmIgKi8KLQl1bnNpZ25lZCBp bnQgcGFuX3gsIHBhbl95OwogCWlndF9yb3RhdGlvbl90IHJvdGF0aW9uOwogCXVpbnQzMl90IGF0 b21pY19wcm9wc19wbGFuZVtJR1RfTlVNX1BMQU5FX1BST1BTXTsKIH0gaWd0X3BsYW5lX3Q7CkBA IC0zMjYsNyArMzIzLDYgQEAgdm9pZCBpZ3RfcGlwZV9zZXRfZ2FtbWFfbHV0KGlndF9waXBlX3Qg KnBpcGUsIHZvaWQgKnB0ciwgc2l6ZV90IGxlbmd0aCk7CiB2b2lkIGlndF9wbGFuZV9zZXRfZmIo aWd0X3BsYW5lX3QgKnBsYW5lLCBzdHJ1Y3QgaWd0X2ZiICpmYik7CiB2b2lkIGlndF9wbGFuZV9z ZXRfcG9zaXRpb24oaWd0X3BsYW5lX3QgKnBsYW5lLCBpbnQgeCwgaW50IHkpOwogdm9pZCBpZ3Rf cGxhbmVfc2V0X3NpemUoaWd0X3BsYW5lX3QgKnBsYW5lLCBpbnQgdywgaW50IGgpOwotdm9pZCBp Z3RfcGxhbmVfc2V0X3Bhbm5pbmcoaWd0X3BsYW5lX3QgKnBsYW5lLCBpbnQgeCwgaW50IHkpOwog dm9pZCBpZ3RfcGxhbmVfc2V0X3JvdGF0aW9uKGlndF9wbGFuZV90ICpwbGFuZSwgaWd0X3JvdGF0 aW9uX3Qgcm90YXRpb24pOwogdm9pZCBpZ3RfY3J0Y19zZXRfYmFja2dyb3VuZChpZ3RfcGlwZV90 ICpwaXBlLCB1aW50NjRfdCBiYWNrZ3JvdW5kKTsKIHZvaWQgaWd0X2ZiX3NldF9wb3NpdGlvbihz dHJ1Y3QgaWd0X2ZiICpmYiwgaWd0X3BsYW5lX3QgKnBsYW5lLApkaWZmIC0tZ2l0IGEvdGVzdHMv a21zX3BhbmVsX2ZpdHRpbmcuYyBiL3Rlc3RzL2ttc19wYW5lbF9maXR0aW5nLmMKaW5kZXggN2M1 MDFmY2RkM2ZiLi5kYTA5ZGEzMmQ3MDQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wYW5lbF9maXR0 aW5nLmMKKysrIGIvdGVzdHMva21zX3BhbmVsX2ZpdHRpbmcuYwpAQCAtODksNyArODksNyBAQCBz dGF0aWMgdm9pZCBwcmVwYXJlX2NydGMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1 dCwgZW51bSBwaXBlIHBpcGUsCiAJCXJldCA9IGRybU1vZGVTZXRDcnRjKGRhdGEtPmRybV9mZCwK IAkJCQlwbGFuZS0+cGlwZS0+Y3J0Y19pZCwKIAkJCQlkYXRhLT5mYl9pZDEsCi0JCQkJcGxhbmUt PnBhbl94LCBwbGFuZS0+cGFuX3ksCisJCQkJcGxhbmUtPnNyY194LCBwbGFuZS0+c3JjX3ksCiAJ CQkJJm91dHB1dC0+aWQsCiAJCQkJMSwKIAkJCQltb2RlKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL2tt c19wbGFuZS5jIGIvdGVzdHMva21zX3BsYW5lLmMKaW5kZXggNjBiOGQ3MWQ1MmQ0Li43YzAxZmU5 MWIyNjMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wbGFuZS5jCisrKyBiL3Rlc3RzL2ttc19wbGFu ZS5jCkBAIC0zMjEsMTEgKzMyMSw5IEBAIHRlc3RfcGxhbmVfcGFubmluZ193aXRoX291dHB1dChk YXRhX3QgKmRhdGEsCiAJaWd0X3BsYW5lX3NldF9mYihwcmltYXJ5LCAmcHJpbWFyeV9mYik7CiAK IAlpZiAoZmxhZ3MgJiBURVNUX1BBTk5JTkdfVE9QX0xFRlQpCi0JCWlndF9wbGFuZV9zZXRfcGFu bmluZyhwcmltYXJ5LCAwLCAwKTsKKwkJaWd0X2ZiX3NldF9wb3NpdGlvbigmcHJpbWFyeV9mYiwg cHJpbWFyeSwgMCwgMCk7CiAJZWxzZQotCQlpZ3RfcGxhbmVfc2V0X3Bhbm5pbmcocHJpbWFyeSwg bW9kZS0+aGRpc3BsYXksIG1vZGUtPnZkaXNwbGF5KTsKLQotCWlndF9wbGFuZV9zZXRfcG9zaXRp b24ocHJpbWFyeSwgMCwgMCk7CisJCWlndF9mYl9zZXRfcG9zaXRpb24oJnByaW1hcnlfZmIsIHBy aW1hcnksIG1vZGUtPmhkaXNwbGF5LCBtb2RlLT52ZGlzcGxheSk7CiAKIAlpZ3RfZGlzcGxheV9j b21taXQoJmRhdGEtPmRpc3BsYXkpOwogCkBAIC0zNDMsNyArMzQxLDcgQEAgdGVzdF9wbGFuZV9w YW5uaW5nX3dpdGhfb3V0cHV0KGRhdGFfdCAqZGF0YSwKIAogCS8qIHJlc2V0IHN0YXRlcyB0byBu ZXV0cmFsIHZhbHVlcywgYXNzdW1lZCBieSBvdGhlciB0ZXN0cyAqLwogCWlndF9vdXRwdXRfc2V0 X3BpcGUob3V0cHV0LCBQSVBFX0FOWSk7Ci0JaWd0X3BsYW5lX3NldF9wYW5uaW5nKHByaW1hcnks IDAsIDApOworCWlndF9mYl9zZXRfcG9zaXRpb24oJnByaW1hcnlfZmIsIHByaW1hcnksIDAsIDAp OwogCiAJdGVzdF9maW5pKGRhdGEpOwogfQpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX3BsYW5lX3Nj YWxpbmcuYyBiL3Rlc3RzL2ttc19wbGFuZV9zY2FsaW5nLmMKaW5kZXggMzliYjVlMTEzNDExLi40 NTQ2Y2U1NDg1MTUgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wbGFuZV9zY2FsaW5nLmMKKysrIGIv dGVzdHMva21zX3BsYW5lX3NjYWxpbmcuYwpAQCAtOTgsNyArOTgsNyBAQCBzdGF0aWMgdm9pZCBw cmVwYXJlX2NydGMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwgZW51bSBwaXBl IHBpcGUsCiAJCXJldCA9IGRybU1vZGVTZXRDcnRjKGRhdGEtPmRybV9mZCwKIAkJCQlwbGFuZS0+ cGlwZS0+Y3J0Y19pZCwKIAkJCQlkYXRhLT5mYl9pZDEsCi0JCQkJcGxhbmUtPnBhbl94LCBwbGFu ZS0+cGFuX3ksCisJCQkJcGxhbmUtPnNyY194LCBwbGFuZS0+c3JjX3ksCiAJCQkJJm91dHB1dC0+ aWQsCiAJCQkJMSwKIAkJCQltb2RlKTsKLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK