Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DC886E13A for ; Mon, 26 Feb 2018 13:47:33 +0000 (UTC) From: Martin Peres Date: Mon, 26 Feb 2018 15:47:02 +0200 Message-Id: <20180226134703.26222-1-martin.peres@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v4 1/2] lib/fb: introduce __igt_create_fb_with_bo_size() and __igt_create_fb() List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Martin Peres List-ID: VGhleSBhcmUgdGhlIHNhbWUgYXMgdGhlaXIgbm9uLXVuZGVyc2NvcmVkIGNvdW50ZXJwYXJ0cywg ZXhjZXB0IHRoZXkKd2lsbCByZXR1cm4gdGhlIGVycm9yIHJhdGhlciB0aGFuIGR5aW5nIHdoZW4g YW4gZXJyb3Igb2NjdXJzLgoKdjI6IChzdWdnZXN0ZWQgYnkgVmlsbGUgU3lyasOkbMOkKQogLSBk cm9wIHRoZSBmYl9pZCBvdXQgcGFyYW1ldGVyLCBpdCBjYW4gYmUgYWNjZXNzZWQgZnJvbSBmYi0+ ZmJfaWQuCgpTaWduZWQtb2ZmLWJ5OiBNYXJ0aW4gUGVyZXMgPG1hcnRpbi5wZXJlc0BsaW51eC5p bnRlbC5jb20+Ci0tLQogbGliL2lndF9mYi5jIHwgOTMgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBsaWIvaWd0X2ZiLmggfCAgNyAr KysrKwogMiBmaWxlcyBjaGFuZ2VkLCA4NSBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9saWIvaWd0X2ZiLmMgYi9saWIvaWd0X2ZiLmMKaW5kZXggZWNkNzMwNTMu LjE5ZTNkNzkyIDEwMDY0NAotLS0gYS9saWIvaWd0X2ZiLmMKKysrIGIvbGliL2lndF9mYi5jCkBA IC03NTksMTggKzc1OSwxOCBAQCB2b2lkIGlndF9wYWludF9pbWFnZShjYWlyb190ICpjciwgY29u c3QgY2hhciAqZmlsZW5hbWUsCiAgKiBUaGUgYmFja2luZyBzdG9yYWdlIG9mIHRoZSBmcmFtZWJ1 ZmZlciBpcyBmaWxsZWQgd2l0aCBhbGwgemVyb3MsIGkuZS4gYmxhY2sKICAqIGZvciByZ2IgcGl4 ZWwgZm9ybWF0cy4KICAqCi0gKiBSZXR1cm5zOgotICogVGhlIGttcyBpZCBvZiB0aGUgY3JlYXRl ZCBmcmFtZWJ1ZmZlci4KKyAqIFJldHVybnM6IDAgaW4gY2FzZSBvZiBzdWNjZXNzLCB0aGUgZXJy b3Igb3RoZXJ3aXNlLiBUaGUgZmJfaWQgY2FuIGJlIGZvdW5kCisgKiBpbiBmYi0+ZmJfaWQuCiAg Ki8KLXVuc2lnbmVkIGludAotaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQg d2lkdGgsIGludCBoZWlnaHQsCi0JCQkgICB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IHRpbGlu ZywKLQkJCSAgIHN0cnVjdCBpZ3RfZmIgKmZiLCB1bnNpZ25lZCBib19zaXplLAotCQkJICAgdW5z aWduZWQgYm9fc3RyaWRlKQoraW50CitfX2lndF9jcmVhdGVfZmJfd2l0aF9ib19zaXplKGludCBm ZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAorCQkJICAgICB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2 NF90IHRpbGluZywKKwkJCSAgICAgc3RydWN0IGlndF9mYiAqZmIsIHVuc2lnbmVkIGJvX3NpemUs CisJCQkgICAgIHVuc2lnbmVkIGJvX3N0cmlkZSkKIHsKIAlzdHJ1Y3QgZm9ybWF0X2Rlc2Nfc3Ry dWN0ICpmID0gbG9va3VwX2RybV9mb3JtYXQoZm9ybWF0KTsKIAl1aW50MzJfdCBmYl9pZDsKLQlp bnQgaTsKKwlpbnQgcmV0LCBpOwogCiAJaWd0X2Fzc2VydF9mKGYsICJEUk0gZm9ybWF0ICUwOHgg bm90IGZvdW5kXG4iLCBmb3JtYXQpOwogCkBAIC03ODksOSArNzg5LDE0IEBAIGlndF9jcmVhdGVf ZmJfd2l0aF9ib19zaXplKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCiAJaWYgKHRp bGluZyAhPSBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FICYmCiAJICAgIHRpbGluZyAhPSBMT0NB TF9JOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCkgewotCQlkb19vcl9kaWUoX19rbXNfYWRkZmIoZmQs IGZiLT5nZW1faGFuZGxlLCB3aWR0aCwgaGVpZ2h0LAotCQkJCSAgICAgIGZiLT5zdHJpZGUsIGZv cm1hdCwgdGlsaW5nLCBmYi0+b2Zmc2V0cywKLQkJCQkgICAgICBMT0NBTF9EUk1fTU9ERV9GQl9N T0RJRklFUlMsICZmYl9pZCkpOworCQlyZXQgPSBfX2ttc19hZGRmYihmZCwgZmItPmdlbV9oYW5k bGUsIHdpZHRoLCBoZWlnaHQsCisJCQkJICBmYi0+c3RyaWRlLCBmb3JtYXQsIHRpbGluZywgZmIt Pm9mZnNldHMsCisJCQkJICBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlMsICZmYl9pZCk7CisJ CWlmIChyZXQpIHsKKwkJCWlndF9kZWJ1ZygiJXM6IF9fa21zX2FkZGZiKCkgZmFpbGVkOiAlZCAo JXMpXG4iLAorCQkJCSAgX19mdW5jX18sIGVycm5vLCBzdHJlcnJvcihlcnJubykpOworCQkJcmV0 dXJuIHJldDsKKwkJfQogCX0gZWxzZSB7CiAJCXVpbnQzMl90IGhhbmRsZXNbNF07CiAJCXVpbnQz Ml90IHBpdGNoZXNbNF07CkBAIC04MDYsOSArODExLDE0IEBAIGlndF9jcmVhdGVfZmJfd2l0aF9i b19zaXplKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCQkJcGl0Y2hlc1tpXSA9IGZi LT5zdHJpZGU7CiAJCX0KIAotCQlkb19vcl9kaWUoZHJtTW9kZUFkZEZCMihmZCwgd2lkdGgsIGhl aWdodCwgZm9ybWF0LAotCQkJCQloYW5kbGVzLCBwaXRjaGVzLCBmYi0+b2Zmc2V0cywKLQkJCQkJ JmZiX2lkLCAwKSk7CisJCXJldCA9IGRybU1vZGVBZGRGQjIoZmQsIHdpZHRoLCBoZWlnaHQsIGZv cm1hdCwKKwkJICAgICAgICAgICAgICAgICAgICBoYW5kbGVzLCBwaXRjaGVzLCBmYi0+b2Zmc2V0 cywKKwkJICAgICAgICAgICAgICAgICAgICAmZmJfaWQsIDApOworCQlpZiAocmV0KSB7CisJCQlp Z3RfZGVidWcoIiVzOiBkcm1Nb2RlQWRkRkIyKCkgZmFpbGVkOiAlZCAoJXMpXG4iLAorCQkJCSAg X19mdW5jX18sIGVycm5vLCBzdHJlcnJvcihlcnJubykpOworCQkJcmV0dXJuIHJldDsKKwkJfQog CX0KIAogCWZiLT53aWR0aCA9IHdpZHRoOwpAQCAtODI5LDcgKzgzOSwzOSBAQCBpZ3RfY3JlYXRl X2ZiX3dpdGhfYm9fc2l6ZShpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwKIAkJZmItPnBs YW5lX3dpZHRoW2ldID0gcGxhbmFyX3dpZHRoKGYsIHdpZHRoLCBpKTsKIAl9CiAKLQlyZXR1cm4g ZmJfaWQ7CisJcmV0dXJuIDA7Cit9CisKKy8qKgorICogaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3Np emU6CisgKiBAZmQ6IG9wZW4gaTkxNSBkcm0gZmlsZSBkZXNjcmlwdG9yCisgKiBAd2lkdGg6IHdp ZHRoIG9mIHRoZSBmcmFtZWJ1ZmZlciBpbiBwaXhlbAorICogQGhlaWdodDogaGVpZ2h0IG9mIHRo ZSBmcmFtZWJ1ZmZlciBpbiBwaXhlbAorICogQGZvcm1hdDogZHJtIGZvdXJjYyBwaXhlbCBmb3Jt YXQgY29kZQorICogQHRpbGluZzogdGlsaW5nIGxheW91dCBvZiB0aGUgZnJhbWVidWZmZXIgKGFz IGZyYW1lYnVmZmVyIG1vZGlmaWVyKQorICogQGZiOiBwb2ludGVyIHRvIGFuICNpZ3RfZmIgc3Ry dWN0dXJlCisgKiBAYm9fc2l6ZTogc2l6ZSBvZiB0aGUgYmFja2luZyBibyAoMCBmb3IgYXV0b21h dGljIHNpemUpCisgKiBAYm9fc3RyaWRlOiBzdHJpZGUgb2YgdGhlIGJhY2tpbmcgYm8gKDAgZm9y IGF1dG9tYXRpYyBzdHJpZGUpCisgKgorICogVGhpcyBmdW5jdGlvbiBhbGxvY2F0ZXMgYSBnZW0g YnVmZmVyIG9iamVjdCBzdWl0YWJsZSB0byBiYWNrIGEgZnJhbWVidWZmZXIKKyAqIHdpdGggdGhl IHJlcXVlc3RlZCBwcm9wZXJ0aWVzIGFuZCB0aGVuIHdyYXBzIGl0IHVwIGluIGEgZHJtIGZyYW1l YnVmZmVyCisgKiBvYmplY3Qgb2YgdGhlIHJlcXVlc3RlZCBzaXplLiBBbGwgbWV0YWRhdGEgaXMg c3RvcmVkIGluIEBmYi4KKyAqCisgKiBUaGUgYmFja2luZyBzdG9yYWdlIG9mIHRoZSBmcmFtZWJ1 ZmZlciBpcyBmaWxsZWQgd2l0aCBhbGwgemVyb3MsIGkuZS4gYmxhY2sKKyAqIGZvciByZ2IgcGl4 ZWwgZm9ybWF0cy4KKyAqCisgKiBSZXR1cm5zOgorICogVGhlIGttcyBpZCBvZiB0aGUgY3JlYXRl ZCBmcmFtZWJ1ZmZlci4KKyAqLwordW5zaWduZWQgaW50CitpZ3RfY3JlYXRlX2ZiX3dpdGhfYm9f c2l6ZShpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwKKwkJCSAgIHVpbnQzMl90IGZvcm1h dCwgdWludDY0X3QgdGlsaW5nLAorCQkJICAgc3RydWN0IGlndF9mYiAqZmIsIHVuc2lnbmVkIGJv X3NpemUsCisJCQkgICB1bnNpZ25lZCBib19zdHJpZGUpCit7CisJZG9fb3JfZGllKF9faWd0X2Ny ZWF0ZV9mYl93aXRoX2JvX3NpemUoZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwKKwkgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aWxpbmcsIGZiLCBib19zaXplLCBib19z dHJpZGUpKTsKKwlyZXR1cm4gZmItPmZiX2lkOwogfQogCiAvKioKQEAgLTg1OCw2ICs5MDAsMjcg QEAgdW5zaWduZWQgaW50IGlndF9jcmVhdGVfZmIoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWln aHQsIHVpbnQzMl90IGZvcm1hdCwKIAkJCQkJICAwLCAwKTsKIH0KIAorLyoqCisgKiBfX2lndF9j cmVhdGVfZmI6CisgKiBAZmQ6IG9wZW4gaTkxNSBkcm0gZmlsZSBkZXNjcmlwdG9yCisgKiBAd2lk dGg6IHdpZHRoIG9mIHRoZSBmcmFtZWJ1ZmZlciBpbiBwaXhlbAorICogQGhlaWdodDogaGVpZ2h0 IG9mIHRoZSBmcmFtZWJ1ZmZlciBpbiBwaXhlbAorICogQGZvcm1hdDogZHJtIGZvdXJjYyBwaXhl bCBmb3JtYXQgY29kZQorICogQHRpbGluZzogdGlsaW5nIGxheW91dCBvZiB0aGUgZnJhbWVidWZm ZXIKKyAqIEBmYjogcG9pbnRlciB0byBhbiAjaWd0X2ZiIHN0cnVjdHVyZQorICoKKyAqIFNhbWUg YXMgaWd0X2NyZWF0ZV9mYiwgYnV0IHJldHVybiBhbiBlcnJvciBpZiBpdCBmYWlsZWQgcmF0aGVy IHRoYW4gZmFpbGluZy4KKyAqCisgKiBSZXR1cm5zOiAwIGluIGNhc2Ugb2Ygc3VjY2VzcywgdGhl IGVycm9yIG90aGVyd2lzZS4gVGhlIGZiX2lkIGNhbiBiZSBmb3VuZAorICogaW4gZmItPmZiX2lk LgorICovCitpbnQgX19pZ3RfY3JlYXRlX2ZiKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCB1aW50MzJfdCBmb3JtYXQsCisJCSAgICB1aW50NjRfdCB0aWxpbmcsIHN0cnVjdCBpZ3RfZmIg KmZiKQoreworCXJldHVybiBfX2lndF9jcmVhdGVfZmJfd2l0aF9ib19zaXplKGZkLCB3aWR0aCwg aGVpZ2h0LCBmb3JtYXQsIHRpbGluZywKKwkJCQkJICAgIGZiLCAwLCAwKTsKK30KKwogLyoqCiAg KiBpZ3RfY3JlYXRlX2NvbG9yX2ZiOgogICogQGZkOiBvcGVuIGk5MTUgZHJtIGZpbGUgZGVzY3Jp cHRvcgpkaWZmIC0tZ2l0IGEvbGliL2lndF9mYi5oIGIvbGliL2lndF9mYi5oCmluZGV4IDAyM2Iw NjlkLi5jZTg5N2Q3NyAxMDA2NDQKLS0tIGEvbGliL2lndF9mYi5oCisrKyBiL2xpYi9pZ3RfZmIu aApAQCAtMTAyLDExICsxMDIsMTggQEAgdm9pZCBpZ3RfZ2V0X2ZiX3RpbGVfc2l6ZShpbnQgZmQs IHVpbnQ2NF90IHRpbGluZywgaW50IGZiX2JwcCwKIAkJCSAgdW5zaWduZWQgKndpZHRoX3JldCwg dW5zaWduZWQgKmhlaWdodF9yZXQpOwogdm9pZCBpZ3RfY2FsY19mYl9zaXplKGludCBmZCwgaW50 IHdpZHRoLCBpbnQgaGVpZ2h0LCB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IHRpbGluZywKIAkJ ICAgICAgdW5zaWduZWQgKnNpemVfcmV0LCB1bnNpZ25lZCAqc3RyaWRlX3JldCk7CitpbnQKK19f aWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQs CisJCQkgICAgIHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgdGlsaW5nLAorCQkJICAgICBzdHJ1 Y3QgaWd0X2ZiICpmYiwgdW5zaWduZWQgYm9fc2l6ZSwKKwkJCSAgICAgdW5zaWduZWQgYm9fc3Ry aWRlKTsKIHVuc2lnbmVkIGludAogaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBp bnQgd2lkdGgsIGludCBoZWlnaHQsCiAJCQkgICB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IHRp bGluZywKIAkJCSAgIHN0cnVjdCBpZ3RfZmIgKmZiLCB1bnNpZ25lZCBib19zaXplLAogCQkJICAg dW5zaWduZWQgYm9fc3RyaWRlKTsKK2ludCBfX2lndF9jcmVhdGVfZmIoaW50IGZkLCBpbnQgd2lk dGgsIGludCBoZWlnaHQsIHVpbnQzMl90IGZvcm1hdCwKKwkJICAgIHVpbnQ2NF90IHRpbGluZywg c3RydWN0IGlndF9mYiAqZmIpOwogdW5zaWduZWQgaW50IGlndF9jcmVhdGVfZmIoaW50IGZkLCBp bnQgd2lkdGgsIGludCBoZWlnaHQsIHVpbnQzMl90IGZvcm1hdCwKIAkJCSAgIHVpbnQ2NF90IHRp bGluZywgc3RydWN0IGlndF9mYiAqZmIpOwogdW5zaWduZWQgaW50IGlndF9jcmVhdGVfY29sb3Jf ZmIoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCi0tIAoyLjE2LjIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0 CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=