From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3392D6E015 for ; Wed, 14 Feb 2018 17:07:45 +0000 (UTC) From: Martin Peres Date: Wed, 14 Feb 2018 19:07:35 +0200 Message-Id: <20180214170736.30859-1-martin.peres@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t v2 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: , MIME-Version: 1.0 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 YW4gZXJyb3Igb2NjdXJzLgoKU2lnbmVkLW9mZi1ieTogTWFydGluIFBlcmVzIDxtYXJ0aW4ucGVy ZXNAbGludXguaW50ZWwuY29tPgotLS0KIGxpYi9pZ3RfZmIuYyB8IDEwMiArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogbGliL2lndF9m Yi5oIHwgICA4ICsrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDk0IGluc2VydGlvbnMoKyksIDE2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfZmIuYyBiL2xpYi9pZ3RfZmIuYwppbmRl eCBlY2Q3MzA1My4uYTk2ZmJhYmEgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZmIuYworKysgYi9saWIv aWd0X2ZiLmMKQEAgLTc1MSw2ICs3NTEsNyBAQCB2b2lkIGlndF9wYWludF9pbWFnZShjYWlyb190 ICpjciwgY29uc3QgY2hhciAqZmlsZW5hbWUsCiAgKiBAZmI6IHBvaW50ZXIgdG8gYW4gI2lndF9m YiBzdHJ1Y3R1cmUKICAqIEBib19zaXplOiBzaXplIG9mIHRoZSBiYWNraW5nIGJvICgwIGZvciBh dXRvbWF0aWMgc2l6ZSkKICAqIEBib19zdHJpZGU6IHN0cmlkZSBvZiB0aGUgYmFja2luZyBibyAo MCBmb3IgYXV0b21hdGljIHN0cmlkZSkKKyAqIEBmYl9pZDogaWYgbm90IE5VTEwsIHJldHVybnMg dGhlIGttcyBpZCBvZiB0aGUgY3JlYXRlZCBmcmFtZWJ1ZmZlcgogICoKICAqIFRoaXMgZnVuY3Rp b24gYWxsb2NhdGVzIGEgZ2VtIGJ1ZmZlciBvYmplY3Qgc3VpdGFibGUgdG8gYmFjayBhIGZyYW1l YnVmZmVyCiAgKiB3aXRoIHRoZSByZXF1ZXN0ZWQgcHJvcGVydGllcyBhbmQgdGhlbiB3cmFwcyBp dCB1cCBpbiBhIGRybSBmcmFtZWJ1ZmZlcgpAQCAtNzU5LDE4ICs3NjAsMTcgQEAgdm9pZCBpZ3Rf cGFpbnRfaW1hZ2UoY2Fpcm9fdCAqY3IsIGNvbnN0IGNoYXIgKmZpbGVuYW1lLAogICogVGhlIGJh Y2tpbmcgc3RvcmFnZSBvZiB0aGUgZnJhbWVidWZmZXIgaXMgZmlsbGVkIHdpdGggYWxsIHplcm9z LCBpLmUuIGJsYWNrCiAgKiBmb3IgcmdiIHBpeGVsIGZvcm1hdHMuCiAgKgotICogUmV0dXJuczoK LSAqIFRoZSBrbXMgaWQgb2YgdGhlIGNyZWF0ZWQgZnJhbWVidWZmZXIuCisgKiBSZXR1cm5zOiAw IGluIGNhc2Ugb2Ygc3VjY2VzcywgdGhlIGVycm9yIG90aGVyd2lzZS4KICAqLwotdW5zaWduZWQg aW50Ci1pZ3RfY3JlYXRlX2ZiX3dpdGhfYm9fc2l6ZShpbnQgZmQsIGludCB3aWR0aCwgaW50IGhl aWdodCwKLQkJCSAgIHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgdGlsaW5nLAotCQkJICAgc3Ry dWN0IGlndF9mYiAqZmIsIHVuc2lnbmVkIGJvX3NpemUsCi0JCQkgICB1bnNpZ25lZCBib19zdHJp ZGUpCitpbnQKK19faWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgs IGludCBoZWlnaHQsCisJCQkgICAgIHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgdGlsaW5nLAor CQkJICAgICBzdHJ1Y3QgaWd0X2ZiICpmYiwgdW5zaWduZWQgYm9fc2l6ZSwKKwkJCSAgICAgdW5z aWduZWQgYm9fc3RyaWRlLCB1aW50MzJfdCAqZmJfaWQgLyogb3V0ICovKQogewogCXN0cnVjdCBm b3JtYXRfZGVzY19zdHJ1Y3QgKmYgPSBsb29rdXBfZHJtX2Zvcm1hdChmb3JtYXQpOwotCXVpbnQz Ml90IGZiX2lkOwotCWludCBpOworCXVpbnQzMl90IF9mYl9pZDsKKwlpbnQgcmV0LCBpOwogCiAJ aWd0X2Fzc2VydF9mKGYsICJEUk0gZm9ybWF0ICUwOHggbm90IGZvdW5kXG4iLCBmb3JtYXQpOwog CkBAIC03ODksOSArNzg5LDE0IEBAIGlndF9jcmVhdGVfZmJfd2l0aF9ib19zaXplKGludCBmZCwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCiAJaWYgKHRpbGluZyAhPSBMT0NBTF9EUk1fRk9STUFU X01PRF9OT05FICYmCiAJICAgIHRpbGluZyAhPSBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWF9USUxF RCkgewotCQlkb19vcl9kaWUoX19rbXNfYWRkZmIoZmQsIGZiLT5nZW1faGFuZGxlLCB3aWR0aCwg aGVpZ2h0LAotCQkJCSAgICAgIGZiLT5zdHJpZGUsIGZvcm1hdCwgdGlsaW5nLCBmYi0+b2Zmc2V0 cywKLQkJCQkgICAgICBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlMsICZmYl9pZCkpOworCQly ZXQgPSBfX2ttc19hZGRmYihmZCwgZmItPmdlbV9oYW5kbGUsIHdpZHRoLCBoZWlnaHQsCisJCQkJ ICBmYi0+c3RyaWRlLCBmb3JtYXQsIHRpbGluZywgZmItPm9mZnNldHMsCisJCQkJICBMT0NBTF9E Uk1fTU9ERV9GQl9NT0RJRklFUlMsICZfZmJfaWQpOworCQlpZiAocmV0KSB7CisJCQlpZ3RfZGVi dWcoIiVzOiBfX2ttc19hZGRmYigpIGZhaWxlZDogJWQgKCVzKVxuIiwKKwkJCQkgIF9fZnVuY19f LCBlcnJubywgc3RyZXJyb3IoZXJybm8pKTsKKwkJCXJldHVybiByZXQ7CisJCX0KIAl9IGVsc2Ug ewogCQl1aW50MzJfdCBoYW5kbGVzWzRdOwogCQl1aW50MzJfdCBwaXRjaGVzWzRdOwpAQCAtODA2 LDE2ICs4MTEsMjEgQEAgaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lk dGgsIGludCBoZWlnaHQsCiAJCQlwaXRjaGVzW2ldID0gZmItPnN0cmlkZTsKIAkJfQogCi0JCWRv X29yX2RpZShkcm1Nb2RlQWRkRkIyKGZkLCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsCi0JCQkJCWhh bmRsZXMsIHBpdGNoZXMsIGZiLT5vZmZzZXRzLAotCQkJCQkmZmJfaWQsIDApKTsKKwkJcmV0ID0g ZHJtTW9kZUFkZEZCMihmZCwgd2lkdGgsIGhlaWdodCwgZm9ybWF0LAorCQkgICAgICAgICAgICAg ICAgICAgIGhhbmRsZXMsIHBpdGNoZXMsIGZiLT5vZmZzZXRzLAorCQkgICAgICAgICAgICAgICAg ICAgICZfZmJfaWQsIDApOworCQlpZiAocmV0KSB7CisJCQlpZ3RfZGVidWcoIiVzOiBkcm1Nb2Rl QWRkRkIyKCkgZmFpbGVkOiAlZCAoJXMpXG4iLAorCQkJCSAgX19mdW5jX18sIGVycm5vLCBzdHJl cnJvcihlcnJubykpOworCQkJcmV0dXJuIHJldDsKKwkJfQogCX0KIAogCWZiLT53aWR0aCA9IHdp ZHRoOwogCWZiLT5oZWlnaHQgPSBoZWlnaHQ7CiAJZmItPnRpbGluZyA9IHRpbGluZzsKIAlmYi0+ ZHJtX2Zvcm1hdCA9IGZvcm1hdDsKLQlmYi0+ZmJfaWQgPSBmYl9pZDsKKwlmYi0+ZmJfaWQgPSBf ZmJfaWQ7CiAJZmItPmZkID0gZmQ7CiAJZmItPm51bV9wbGFuZXMgPSBmLT5wbGFuZXMgPzogMTsK IAlmYi0+cGxhbmVfYnBwWzBdID0gZi0+YnBwOwpAQCAtODI5LDYgKzgzOSw0NCBAQCBpZ3RfY3Jl YXRlX2ZiX3dpdGhfYm9fc2l6ZShpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwKIAkJZmIt PnBsYW5lX3dpZHRoW2ldID0gcGxhbmFyX3dpZHRoKGYsIHdpZHRoLCBpKTsKIAl9CiAKKwlpZiAo ZmJfaWQpCisJCSpmYl9pZCA9IF9mYl9pZDsKKworCXJldHVybiAwOworfQorCisvKioKKyAqIGln dF9jcmVhdGVfZmJfd2l0aF9ib19zaXplOgorICogQGZkOiBvcGVuIGk5MTUgZHJtIGZpbGUgZGVz Y3JpcHRvcgorICogQHdpZHRoOiB3aWR0aCBvZiB0aGUgZnJhbWVidWZmZXIgaW4gcGl4ZWwKKyAq IEBoZWlnaHQ6IGhlaWdodCBvZiB0aGUgZnJhbWVidWZmZXIgaW4gcGl4ZWwKKyAqIEBmb3JtYXQ6 IGRybSBmb3VyY2MgcGl4ZWwgZm9ybWF0IGNvZGUKKyAqIEB0aWxpbmc6IHRpbGluZyBsYXlvdXQg b2YgdGhlIGZyYW1lYnVmZmVyIChhcyBmcmFtZWJ1ZmZlciBtb2RpZmllcikKKyAqIEBmYjogcG9p bnRlciB0byBhbiAjaWd0X2ZiIHN0cnVjdHVyZQorICogQGJvX3NpemU6IHNpemUgb2YgdGhlIGJh Y2tpbmcgYm8gKDAgZm9yIGF1dG9tYXRpYyBzaXplKQorICogQGJvX3N0cmlkZTogc3RyaWRlIG9m IHRoZSBiYWNraW5nIGJvICgwIGZvciBhdXRvbWF0aWMgc3RyaWRlKQorICoKKyAqIFRoaXMgZnVu Y3Rpb24gYWxsb2NhdGVzIGEgZ2VtIGJ1ZmZlciBvYmplY3Qgc3VpdGFibGUgdG8gYmFjayBhIGZy YW1lYnVmZmVyCisgKiB3aXRoIHRoZSByZXF1ZXN0ZWQgcHJvcGVydGllcyBhbmQgdGhlbiB3cmFw cyBpdCB1cCBpbiBhIGRybSBmcmFtZWJ1ZmZlcgorICogb2JqZWN0IG9mIHRoZSByZXF1ZXN0ZWQg c2l6ZS4gQWxsIG1ldGFkYXRhIGlzIHN0b3JlZCBpbiBAZmIuCisgKgorICogVGhlIGJhY2tpbmcg c3RvcmFnZSBvZiB0aGUgZnJhbWVidWZmZXIgaXMgZmlsbGVkIHdpdGggYWxsIHplcm9zLCBpLmUu IGJsYWNrCisgKiBmb3IgcmdiIHBpeGVsIGZvcm1hdHMuCisgKgorICogUmV0dXJuczoKKyAqIFRo ZSBrbXMgaWQgb2YgdGhlIGNyZWF0ZWQgZnJhbWVidWZmZXIuCisgKi8KK3Vuc2lnbmVkIGludAor aWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQs CisJCQkgICB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IHRpbGluZywKKwkJCSAgIHN0cnVjdCBp Z3RfZmIgKmZiLCB1bnNpZ25lZCBib19zaXplLAorCQkJICAgdW5zaWduZWQgYm9fc3RyaWRlKQor eworCXVpbnQzMl90IGZiX2lkOworCisJZG9fb3JfZGllKF9faWd0X2NyZWF0ZV9mYl93aXRoX2Jv X3NpemUoZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwKKwkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0aWxpbmcsIGZiLCBib19zaXplLCBib19zdHJpZGUsCisJICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmZiX2lkKSk7CiAJcmV0dXJuIGZiX2lk OwogfQogCkBAIC04NTgsNiArOTA2LDI4IEBAIHVuc2lnbmVkIGludCBpZ3RfY3JlYXRlX2ZiKGlu dCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCB1aW50MzJfdCBmb3JtYXQsCiAJCQkJCSAgMCwg MCk7CiB9CiAKKy8qKgorICogX19pZ3RfY3JlYXRlX2ZiOgorICogQGZkOiBvcGVuIGk5MTUgZHJt IGZpbGUgZGVzY3JpcHRvcgorICogQHdpZHRoOiB3aWR0aCBvZiB0aGUgZnJhbWVidWZmZXIgaW4g cGl4ZWwKKyAqIEBoZWlnaHQ6IGhlaWdodCBvZiB0aGUgZnJhbWVidWZmZXIgaW4gcGl4ZWwKKyAq IEBmb3JtYXQ6IGRybSBmb3VyY2MgcGl4ZWwgZm9ybWF0IGNvZGUKKyAqIEB0aWxpbmc6IHRpbGlu ZyBsYXlvdXQgb2YgdGhlIGZyYW1lYnVmZmVyCisgKiBAZmI6IHBvaW50ZXIgdG8gYW4gI2lndF9m YiBzdHJ1Y3R1cmUKKyAqIEBmYl9pZDogaWYgbm90IE5VTEwsIHJldHVybnMgdGhlIGttcyBpZCBv ZiB0aGUgY3JlYXRlZCBmcmFtZWJ1ZmZlcgorICoKKyAqIFNhbWUgYXMgaWd0X2NyZWF0ZV9mYiwg YnV0IHJldHVybiBhbiBlcnJvciBpZiBpdCBmYWlsZWQgcmF0aGVyIHRoYW4gZmFpbGluZy4KKyAq CisgKiBSZXR1cm5zOiAwIGluIGNhc2Ugb2Ygc3VjY2VzcywgdGhlIGVycm9yIG90aGVyd2lzZS4K KyAqLworaW50IF9faWd0X2NyZWF0ZV9mYihpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwg dWludDMyX3QgZm9ybWF0LAorCQkgICAgdWludDY0X3QgdGlsaW5nLCBzdHJ1Y3QgaWd0X2ZiICpm YiwKKwkJICAgIHVpbnQzMl90ICpmYl9pZCAvKiBvdXQgKi8pCit7CisJcmV0dXJuIF9faWd0X2Ny ZWF0ZV9mYl93aXRoX2JvX3NpemUoZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdGlsaW5nLAor CQkJCQkgICAgZmIsIDAsIDAsIGZiX2lkKTsKK30KKwogLyoqCiAgKiBpZ3RfY3JlYXRlX2NvbG9y X2ZiOgogICogQGZkOiBvcGVuIGk5MTUgZHJtIGZpbGUgZGVzY3JpcHRvcgpkaWZmIC0tZ2l0IGEv bGliL2lndF9mYi5oIGIvbGliL2lndF9mYi5oCmluZGV4IDAyM2IwNjlkLi44YThiYjM0ZCAxMDA2 NDQKLS0tIGEvbGliL2lndF9mYi5oCisrKyBiL2xpYi9pZ3RfZmIuaApAQCAtMTAyLDExICsxMDIs MTkgQEAgdm9pZCBpZ3RfZ2V0X2ZiX3RpbGVfc2l6ZShpbnQgZmQsIHVpbnQ2NF90IHRpbGluZywg aW50IGZiX2JwcCwKIAkJCSAgdW5zaWduZWQgKndpZHRoX3JldCwgdW5zaWduZWQgKmhlaWdodF9y ZXQpOwogdm9pZCBpZ3RfY2FsY19mYl9zaXplKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCB1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IHRpbGluZywKIAkJICAgICAgdW5zaWduZWQgKnNp emVfcmV0LCB1bnNpZ25lZCAqc3RyaWRlX3JldCk7CitpbnQKK19faWd0X2NyZWF0ZV9mYl93aXRo X2JvX3NpemUoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCisJCQkgICAgIHVpbnQzMl90 IGZvcm1hdCwgdWludDY0X3QgdGlsaW5nLAorCQkJICAgICBzdHJ1Y3QgaWd0X2ZiICpmYiwgdW5z aWduZWQgYm9fc2l6ZSwKKwkJCSAgICAgdW5zaWduZWQgYm9fc3RyaWRlLCB1aW50MzJfdCAqZmJf aWQgLyogb3V0ICovKTsKIHVuc2lnbmVkIGludAogaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUo aW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJCQkgICB1aW50MzJfdCBmb3JtYXQsIHVp bnQ2NF90IHRpbGluZywKIAkJCSAgIHN0cnVjdCBpZ3RfZmIgKmZiLCB1bnNpZ25lZCBib19zaXpl LAogCQkJICAgdW5zaWduZWQgYm9fc3RyaWRlKTsKK2ludCBfX2lndF9jcmVhdGVfZmIoaW50IGZk LCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIHVpbnQzMl90IGZvcm1hdCwKKwkJICAgIHVpbnQ2NF90 IHRpbGluZywgc3RydWN0IGlndF9mYiAqZmIsCisJCSAgICB1aW50MzJfdCAqZmJfaWQgLyogb3V0 ICovKTsKIHVuc2lnbmVkIGludCBpZ3RfY3JlYXRlX2ZiKGludCBmZCwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0LCB1aW50MzJfdCBmb3JtYXQsCiAJCQkgICB1aW50NjRfdCB0aWxpbmcsIHN0cnVjdCBp Z3RfZmIgKmZiKTsKIHVuc2lnbmVkIGludCBpZ3RfY3JlYXRlX2NvbG9yX2ZiKGludCBmZCwgaW50 IHdpZHRoLCBpbnQgaGVpZ2h0LAotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2lndC1kZXYK