From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH] tests/kms_addfb: Add support for fb modifiers Date: Wed, 4 Feb 2015 16:42:14 +0000 Message-ID: <1423068134-12884-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C7ED6E2B2 for ; Wed, 4 Feb 2015 08:42:36 -0800 (PST) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkp1c3QgYSBm ZXcgYmFzaWMgdGVzdHMgdG8gbWFrZSBzdXJlIGZiIG1vZGlmaWVycyBjYW4gYmUgdXNlZCBhbmQK YmVoYXZlIHNhbmVseSB3aGVuIG1peGVkIHdpdGggdGhlIG9sZCBzZXRfdGlsaW5nIEFQSS4KClNp Z25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0t LQogbGliL2lvY3RsX3dyYXBwZXJzLmMgfCA0NSArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogbGliL2lvY3RsX3dyYXBwZXJzLmggfCAzNiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIHRlc3RzL2ttc19hZGRmYi5jICAgIHwgNjIgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxNDMg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2xpYi9pb2N0bF93cmFwcGVycy5jIGIvbGliL2lv Y3RsX3dyYXBwZXJzLmMKaW5kZXggMTlhNDU3YS4uYmNhNmQyYSAxMDA2NDQKLS0tIGEvbGliL2lv Y3RsX3dyYXBwZXJzLmMKKysrIGIvbGliL2lvY3RsX3dyYXBwZXJzLmMKQEAgLTEwOTEsMyArMTA5 MSw0OCBAQCBpbnQgZ2VtX2NvbnRleHRfaGFzX3BhcmFtKGludCBmZCwgdWludDY0X3QgcGFyYW0p CiAKIAlyZXR1cm4gZ2VtX2NvbnRleHRfZ2V0X3BhcmFtKGZkLCAmcCkgPT0gMDsKIH0KKworaW50 IF9kcm1Nb2RlQWRkRkIyKGludCBmZCwgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCwK KwkJICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0LCB1aW50MzJfdCBib19oYW5kbGVzWzRdLAorCQkg ICB1aW50MzJfdCBwaXRjaGVzWzRdLCB1aW50MzJfdCBvZmZzZXRzWzRdLAorCQkgICB1aW50NjRf dCBtb2RpZmllclswXSwgdWludDMyX3QgKmJ1Zl9pZCwgdWludDMyX3QgZmxhZ3MpCit7CisJc3Ry dWN0IGxvY2FsX2RybV9tb2RlX2ZiX2NtZDIgZjsKKwlpbnQgcmV0OworCisJZi53aWR0aCAgPSB3 aWR0aDsKKwlmLmhlaWdodCA9IGhlaWdodDsKKwlmLnBpeGVsX2Zvcm1hdCA9IHBpeGVsX2Zvcm1h dDsKKwlmLmZsYWdzID0gZmxhZ3M7CisKKwltZW1jcHkoZi5oYW5kbGVzLCBib19oYW5kbGVzLCA0 ICogc2l6ZW9mKGJvX2hhbmRsZXNbMF0pKTsKKwltZW1jcHkoZi5waXRjaGVzLCBwaXRjaGVzLCA0 ICogc2l6ZW9mKHBpdGNoZXNbMF0pKTsKKwltZW1jcHkoZi5vZmZzZXRzLCBvZmZzZXRzLCA0ICog c2l6ZW9mKG9mZnNldHNbMF0pKTsKKwltZW1jcHkoZi5tb2RpZmllciwgbW9kaWZpZXIsIDQgKiBz aXplb2YobW9kaWZpZXJbMF0pKTsKKworCWlmICgocmV0ID0gZHJtSW9jdGwoZmQsIExPQ0FMX0RS TV9JT0NUTF9NT0RFX0FEREZCMiwgJmYpKSkKKwkJcmV0dXJuIHJldCA8IDAgPyAtZXJybm8gOiBy ZXQ7CisKKwkqYnVmX2lkID0gZi5mYl9pZDsKKwlyZXR1cm4gMDsKK30KKwordW5zaWduZWQgaW50 IGhhc19kcm1fZmJfbW9kaWZpZXJzKGludCBmZCkKK3sKKwlzdGF0aWMgdW5zaWduZWQgaW50IGhh c19tb2RpZmllcnMsIGNhcF9tb2RpZmllcnNfdGVzdGVkOworCXVpbnQ2NF90IGNhcF9tb2RpZmll cnM7CisJaW50IHJldDsKKworCWlmIChjYXBfbW9kaWZpZXJzX3Rlc3RlZCkKKwkJcmV0dXJuIGhh c19tb2RpZmllcnM7CisKKwlyZXQgPSBkcm1HZXRDYXAoZmQsIExPQ0FMX0RSTV9DQVBfQURERkIy X01PRElGSUVSUywgJmNhcF9tb2RpZmllcnMpOworCWlndF9hc3NlcnQocmV0ID09IDAgfHwgZXJy bm8gPT0gRUlOVkFMKTsKKwloYXNfbW9kaWZpZXJzID0gcmV0ID09IDAgJiYgY2FwX21vZGlmaWVy cyA9PSAxOworCWNhcF9tb2RpZmllcnNfdGVzdGVkID0gMTsKKworCWlmIChoYXNfbW9kaWZpZXJz KQorCQlpZ3RfZGVidWcoIkRSTV9DQVBfQURERkIyX01PRElGSUVSU1xuIik7CisKKwlyZXR1cm4g aGFzX21vZGlmaWVyczsKK30KZGlmZiAtLWdpdCBhL2xpYi9pb2N0bF93cmFwcGVycy5oIGIvbGli L2lvY3RsX3dyYXBwZXJzLmgKaW5kZXggMzBhYjgzNi4uYzI3NzAxMiAxMDA2NDQKLS0tIGEvbGli L2lvY3RsX3dyYXBwZXJzLmgKKysrIGIvbGliL2lvY3RsX3dyYXBwZXJzLmgKQEAgLTExNyw0ICsx MTcsNDAgQEAgaW50IGdlbV9jb250ZXh0X2hhc19wYXJhbShpbnQgZmQsIHVpbnQ2NF90IHBhcmFt KTsKIGludCBnZW1fY29udGV4dF9nZXRfcGFyYW0oaW50IGZkLCBzdHJ1Y3QgbG9jYWxfaTkxNV9n ZW1fY29udGV4dF9wYXJhbSAqcCk7CiBpbnQgZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGludCBmZCwg c3RydWN0IGxvY2FsX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApOwogCitzdHJ1Y3QgbG9jYWxf ZHJtX21vZGVfZmJfY21kMiB7CisJdWludDMyX3QgZmJfaWQ7CisJdWludDMyX3Qgd2lkdGgsIGhl aWdodDsKKwl1aW50MzJfdCBwaXhlbF9mb3JtYXQ7CisJdWludDMyX3QgZmxhZ3M7CisJdWludDMy X3QgaGFuZGxlc1s0XTsKKwl1aW50MzJfdCBwaXRjaGVzWzRdOworCXVpbnQzMl90IG9mZnNldHNb NF07CisJdWludDY0X3QgbW9kaWZpZXJbNF07Cit9OworCisjZGVmaW5lIExPQ0FMX0RSTV9NT0RF X0ZCX01PRElGSUVSUwkoMTw8MSkKKworI2RlZmluZSBMT0NBTF9EUk1fRk9STUFUX01PRF9WRU5E T1JfSU5URUwgICAweDAxCisKKyNkZWZpbmUgbG9jYWxfZm91cmNjX21vZF9jb2RlKHZlbmRvciwg dmFsKSBcCisJKCgoKHVpbnQ2NF90KUxPQ0FMX0RSTV9GT1JNQVRfTU9EX1ZFTkRPUl8jIyB2ZW5k b3IpIDw8IDU2KSB8IFwKKwkgICh2YWwgJiAweDAwZmZmZmZmZmZmZmZmZmZMKSkKKworI2RlZmlu ZSBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfTk9ORQlsb2NhbF9mb3VyY2NfbW9kX2NvZGUoSU5URUws IFwKKwkJCQkJCQkgICAgICAweDAwMDAwMDAwMDAwMDAwTCkKKyNkZWZpbmUgTE9DQUxfSTkxNV9G T1JNQVRfTU9EX1hfVElMRUQJbG9jYWxfZm91cmNjX21vZF9jb2RlKElOVEVMLCBcCisJCQkJCQkJ ICAgICAgMHgwMDAwMDAwMDAwMDAwMUwpCisKKyNkZWZpbmUgTE9DQUxfRFJNX0lPQ1RMX01PREVf QURERkIyCURSTV9JT1dSKDB4QjgsIFwKKwkJCQkJCSBzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfZmJf Y21kMikKKworaW50IF9kcm1Nb2RlQWRkRkIyKGludCBmZCwgdWludDMyX3Qgd2lkdGgsIHVpbnQz Ml90IGhlaWdodCwKKwkJICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0LCB1aW50MzJfdCBib19oYW5k bGVzWzRdLAorCQkgICB1aW50MzJfdCBwaXRjaGVzWzRdLCB1aW50MzJfdCBvZmZzZXRzWzRdLAor CQkgICB1aW50NjRfdCBtb2RpZmllclswXSwgdWludDMyX3QgKmJ1Zl9pZCwgdWludDMyX3QgZmxh Z3MpOworCisjZGVmaW5lIExPQ0FMX0RSTV9DQVBfQURERkIyX01PRElGSUVSUwkweDEwCisKK3Vu c2lnbmVkIGludCBoYXNfZHJtX2ZiX21vZGlmaWVycyhpbnQgZmQpOworCiAjZW5kaWYgLyogSU9D VExfV1JBUFBFUlNfSCAqLwpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2FkZGZiLmMgYi90ZXN0cy9r bXNfYWRkZmIuYwppbmRleCA3NTY1ODllLi45YjBmNzdjIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNf YWRkZmIuYworKysgYi90ZXN0cy9rbXNfYWRkZmIuYwpAQCAtMjEzLDYgKzIxMyw2NiBAQCBzdGF0 aWMgdm9pZCBzaXplX3Rlc3RzKGludCBmZCkKIAl9CiB9CiAKK3N0YXRpYyB2b2lkIGFkZGZiMjVf dGVzdHMoaW50IGZkKQoreworCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9mYl9jbWQyIGYgPSB7fTsK KworCisJaWd0X3JlcXVpcmUoaGFzX2RybV9mYl9tb2RpZmllcnMoZmQpKTsKKworCW1lbXNldCgm ZiwgMCwgc2l6ZW9mKGYpKTsKKworCWYud2lkdGggPSAxMDI0OworCWYuaGVpZ2h0ID0gMTAyNDsK KwlmLnBpeGVsX2Zvcm1hdCA9IERSTV9GT1JNQVRfWFJHQjg4ODg7CisJZi5waXRjaGVzWzBdID0g MTAyNCo0OworCWYuZmxhZ3MgPSBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlM7CisJZi5tb2Rp ZmllclswXSA9IExPQ0FMX0k5MTVfRk9STUFUX01PRF9OT05FOworCisJaWd0X2ZpeHR1cmUgewor CQlnZW1fYm8gPSBnZW1fY3JlYXRlKGZkLCAxMDI0KjEwMjQqNCk7CisJCWlndF9hc3NlcnQoZ2Vt X2JvKTsKKwl9CisKKwlmLmhhbmRsZXNbMF0gPSBnZW1fYm87CisKKwlpZ3Rfc3VidGVzdCgiYWRk ZmIyNS1YLXRpbGVkIikgeworCQlmLm1vZGlmaWVyWzBdID0gTE9DQUxfSTkxNV9GT1JNQVRfTU9E X1hfVElMRUQ7CisJCWlndF9hc3NlcnQoZHJtSW9jdGwoZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RF X0FEREZCMiwgJmYpID09IDApOworCQlpZ3RfYXNzZXJ0KGRybUlvY3RsKGZkLCBEUk1fSU9DVExf TU9ERV9STUZCLCAmZi5mYl9pZCkgPT0gMCk7CisJCWYuZmJfaWQgPSAwOworCX0KKworCWlndF9z dWJ0ZXN0KCJhZGRmYjI1LWZyYW1lYnVmZmVyLXZzLXNldC10aWxpbmciKSB7CisJCWlndF9hc3Nl cnQoZHJtSW9jdGwoZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0FEREZCMiwgJmYpID09IDApOwor CQlpZ3RfYXNzZXJ0KF9fZ2VtX3NldF90aWxpbmcoZmQsIGdlbV9ibywgSTkxNV9USUxJTkdfWCwg NTEyKjQpID09IC1FQlVTWSk7CisJCWlndF9hc3NlcnQoX19nZW1fc2V0X3RpbGluZyhmZCwgZ2Vt X2JvLCBJOTE1X1RJTElOR19YLCAxMDI0KjQpID09IC1FQlVTWSk7CisJCWlndF9hc3NlcnQoZHJt SW9jdGwoZmQsIERSTV9JT0NUTF9NT0RFX1JNRkIsICZmLmZiX2lkKSA9PSAwKTsKKwkJZi5mYl9p ZCA9IDA7CisJfQorCisJaWd0X2ZpeHR1cmUKKwkJZ2VtX3NldF90aWxpbmcoZmQsIGdlbV9ibywg STkxNV9USUxJTkdfWCwgMTAyNCo0KTsKKwlmLnBpdGNoZXNbMF0gPSAxMDI0KjQ7CisKKwlpZ3Rf c3VidGVzdCgiYWRkZmIyNS1YLXRpbGVkLWJvdGgiKSB7CisJCWYubW9kaWZpZXJbMF0gPSBMT0NB TF9JOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDsKKwkJaWd0X2Fzc2VydChkcm1Jb2N0bChmZCwgTE9D QUxfRFJNX0lPQ1RMX01PREVfQURERkIyLCAmZikgPT0gMCk7CisJCWlndF9hc3NlcnQoZHJtSW9j dGwoZmQsIERSTV9JT0NUTF9NT0RFX1JNRkIsICZmLmZiX2lkKSA9PSAwKTsKKwkJZi5mYl9pZCA9 IDA7CisJfQorCisJaWd0X3N1YnRlc3QoImFkZGZiMjUtWC10aWxlZC1taXNtYXRjaCIpIHsKKwkJ Zi5tb2RpZmllclswXSA9IExPQ0FMX0k5MTVfRk9STUFUX01PRF9OT05FOworCQlpZ3RfYXNzZXJ0 KGRybUlvY3RsKGZkLCBMT0NBTF9EUk1fSU9DVExfTU9ERV9BRERGQjIsICZmKSA8IDAgJiYgZXJy bm8gPT0gRUlOVkFMKTsKKwkJZi5mYl9pZCA9IDA7CisJfQorCisJaWd0X2ZpeHR1cmUgeworCQln ZW1fY2xvc2UoZmQsIGdlbV9ibyk7CisJfQorfQorCiBpbnQgZmQ7CiAKIGlndF9tYWluCkBAIC0y MjQsNiArMjg0LDggQEAgaWd0X21haW4KIAogCXNpemVfdGVzdHMoZmQpOwogCisJYWRkZmIyNV90 ZXN0cyhmZCk7CisKIAlpZ3RfZml4dHVyZQogCQljbG9zZShmZCk7CiB9Ci0tIAoyLjIuMgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK