From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Ekstrand Subject: [PATCH] tests/kms_ccs: Fix the color/ccs surface generation Date: Thu, 3 Aug 2017 17:52:41 -0700 Message-ID: <1501807961-23186-1-git-send-email-jason.ekstrand@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCD336E122 for ; Fri, 4 Aug 2017 00:52:46 +0000 (UTC) Received: by mail-pf0-x241.google.com with SMTP id t86so297254pfe.1 for ; Thu, 03 Aug 2017 17:52:46 -0700 (PDT) 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 Cc: Jason Ekstrand , Daniel Vetter , Daniel Stone , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org UHJldmlvdXNseSwgdGhlIHRlc3QgdXNlZCB0aGUgb2xkIDY0eDY0IGNvbnZlbnRpb24gdGhhdCBW aWxsZSBpbnRyb2R1Y2VkCmZvciBDQ1MgdGlsZXMgYW5kIG5vdCB0aGUgY3VycmVudCAxMjh4MzIg WS10aWxlIGNvbnZlbnRpb24uICBBbHNvLCB0aGUKb3JpZ2luYWwgc2NoZW1lIGZvciBnZW5lcmF0 aW5nIHRoZSBDQ1MgZGF0YSB3YXMgb3Zlci1jb21wbGljYXRlZCBhbmQKZGlkbid0IHdvcmsgY29y cmVjdGx5IGJlY2F1c2UgaXQgYXNzdW1lZCB5b3UgY291bGQgY3V0IHRoZSBtYWluIHN1cmZhY2UK YXQgYW4gYXJiaXRyYXJ5IFkgY29vcmRpbmF0ZS4gIFdoaWxlIHlvdSBjbGVhcmx5ICpjYW4qIGRv IHRoaXMgKHRoZQpoYXJkd2FyZSBkb2VzKSwgaXQncyBub3QgYSBnb29kIGlkZWEgZm9yIGEgZ2Vu ZXJhdG9yIGluIGEgdGVzdC4gIFRoZSBuZXcKc2NoZW1lLCBpbnRyb2R1Y2VkIGhlcmUsIGlzIGVu dGlyZWx5IGJhc2VkIG9uIHRoZSByZWxhdGlvbnNoaXAgYmV0d2VlbgpjYWNoZS1saW5lcyBpbiB0 aGUgbWFpbiBzdXJmYWNlIGFuZCB0aGUgQ0NTIHRoYXQncyBkb2N1bWVudGVkIGluIHRoZQpQUk0u ICBCeSBrZWVwaW5nIGV2ZXJ5dGhpbmcgQ0NTIGNhY2hlLWxpbmUgYWxpZ25lZCwgb3VyIGNoYW5j ZXMgb2YKZ2VuZXJhdGluZyBjb3JyZWN0IGRhdGEgZm9yIGFuIGFyYml0cmFyeS1zaXplIHN1cmZh Y2UgYXJlIG11Y2ggaGlnaGVyLgoKU2lnbmVkLW9mZi1ieTogSmFzb24gRWtzdHJhbmQgPGphc29u LmVrc3RyYW5kQGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+CkNjOiBCZW4gV2lkYXdza3kgPGJlbmphbWluLndpZGF3c2t5QGludGVs LmNvbT4KQ2M6IERhbmllbCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgpDYzogRGFuaWVs IFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiB0ZXN0cy9rbXNfY2NzLmMgfCA5 MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS90ZXN0cy9rbXNfY2NzLmMgYi90ZXN0cy9rbXNfY2NzLmMKaW5kZXggMjlkNjc2 YS4uZWY5NTJmMiAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2Njcy5jCisrKyBiL3Rlc3RzL2ttc19j Y3MuYwpAQCAtNDgsMTIgKzQ4LDE3IEBAIHR5cGVkZWYgc3RydWN0IHsKICNkZWZpbmUgQ09NUFJF U1NFRF9HUkVFTgkweDAwMGZmMDBmCiAjZGVmaW5lIENPTVBSRVNTRURfQkxVRQkJMHgwMDAwMGZm ZgogCisjZGVmaW5lIENDU19VTkNPTVBSRVNTRUQJMHgwCisjZGVmaW5lIENDU19DT01QUkVTU0VE CQkweDU1CisKICNkZWZpbmUgUkVECQkJMHgwMGZmMDAwMAogCi1zdGF0aWMgdm9pZCByZW5kZXJf ZmIoZGF0YV90ICpkYXRhLCBib29sIGNvbXByZXNzZWQpCitzdGF0aWMgdm9pZCByZW5kZXJfZmIo ZGF0YV90ICpkYXRhLCBib29sIGNvbXByZXNzZWQsCisJCSAgICAgIGludCBoZWlnaHQsIHVuc2ln bmVkIGludCBzdHJpZGUpCiB7CiAJc3RydWN0IGlndF9mYiAqZmIgPSAmZGF0YS0+ZmI7CiAJdWlu dDMyX3QgKnB0cjsKKwl1bnNpZ25lZCBpbnQgaGFsZl9oZWlnaHQsIGhhbGZfc2l6ZTsKIAlpbnQg aTsKIAogCWlndF9hc3NlcnQoZmItPmZiX2lkKTsKQEAgLTYyLDQzICs2Nyw2MyBAQCBzdGF0aWMg dm9pZCByZW5kZXJfZmIoZGF0YV90ICpkYXRhLCBib29sIGNvbXByZXNzZWQpCiAJCQkgICAgMCwg ZmItPnNpemUsCiAJCQkgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7CiAKLQlmb3IgKGkgPSAw OyBpIDwgZmItPnNpemUgLyA0OyBpKyspIHsKLQkJLyogRmlsbCB1cHBlciBoYWxmIGFzIGNvbXBy ZXNzZWQgKi8KLQkJaWYgKGNvbXByZXNzZWQgJiYgaSA8IGZiLT5zaXplIC8gNCAvIDIpCi0JCQlw dHJbaV0gPSBDT01QUkVTU0VEX1JFRDsKLQkJZWxzZQorCWlmIChjb21wcmVzc2VkKSB7CisJCS8q IEluIHRoZSBjb21wcmVzc2VkIGNhc2UsIHdlIHdhbnQgdGhlIHRvcCBoYWxmIG9mIHRoZQorCQkg KiBzdXJmYWNlIHRvIGJlIHVuY29tcHJlc3NlZCBhbmQgdGhlIGJvdHRvbSBoYWxmIHRvIGJlCisJ CSAqIGNvbXByZXNzZWQuCisJCSAqCisJCSAqIFdlIG5lZWQgdG8gY3V0IHRoZSBzdXJmYWNlIG9u IGEgQ0NTIGNhY2hlLWxpbmUgYm91bmRhcnksCisJCSAqIG90aGVyd2lzZSwgd2UncmUgZ29pbmcg dG8gYmUgaW4gdHJvdWJsZSB3aGVuIHdlIHRyeSB0bworCQkgKiBnZW5lcmF0ZSBDQ1MgZGF0YSBm b3IgdGhlIHN1cmZhY2UuICBBIGNhY2hlIGxpbmUgaW4gdGhlCisJCSAqIENDUyBpcyAxNngxNiBj YWNoZS1saW5lLXBhaXJzIGluIHRoZSBtYWluIHN1cmZhY2UuICAxNgorCQkgKiBjYWNoZSBsaW5l cyBpcyA2NCByb3dzIGhpZ2guCisJCSAqLworCQloYWxmX2hlaWdodCA9IEFMSUdOKGhlaWdodCwg MTI4KSAvIDI7CisJCWhhbGZfc2l6ZSA9IGhhbGZfaGVpZ2h0ICogc3RyaWRlOworCQlmb3IgKGkg PSAwOyBpIDwgZmItPnNpemUgLyA0OyBpKyspIHsKKwkJCWlmIChpIDwgaGFsZl9zaXplIC8gNCkK KwkJCQlwdHJbaV0gPSBSRUQ7CisJCQllbHNlCisJCQkJcHRyW2ldID0gQ09NUFJFU1NFRF9SRUQ7 CisJCX0KKwl9IGVsc2UgeworCQlmb3IgKGkgPSAwOyBpIDwgZmItPnNpemUgLyA0OyBpKyspCiAJ CQlwdHJbaV0gPSBSRUQ7CiAJfQogCiAJbXVubWFwKHB0ciwgZmItPnNpemUpOwogfQogCi1zdGF0 aWMgdWludDhfdCAqY2NzX3B0cih1aW50OF90ICpwdHIsCi0JCQl1bnNpZ25lZCBpbnQgeCwgdW5z aWduZWQgaW50IHksCi0JCQl1bnNpZ25lZCBpbnQgc3RyaWRlKQorc3RhdGljIHVuc2lnbmVkIGlu dAoreV90aWxlX3lfcG9zKHVuc2lnbmVkIGludCBvZmZzZXQsIHVuc2lnbmVkIGludCBzdHJpZGUp CiB7Ci0JcmV0dXJuIHB0ciArCi0JCSgoeSAmIH4weDNmKSAqIHN0cmlkZSkgKwotCQkoKHggJiB+ MHg3KSAqIDY0KSArCi0JCSgoeSAmIDB4M2YpICogOCkgKwotCQkoeCAmIDcpOworCXVuc2lnbmVk IGludCB5X3RpbGVzLCB5OworCXlfdGlsZXMgPSAob2Zmc2V0IC8gNDA5NikgLyAoc3RyaWRlIC8g MTI4KTsKKwl5ID0geV90aWxlcyAqIDMyICsgKChvZmZzZXQgJiAweDFmMCkgPj4gNCk7CisJcmV0 dXJuIHk7CiB9CiAKIHN0YXRpYyB2b2lkIHJlbmRlcl9jY3MoZGF0YV90ICpkYXRhLCB1aW50MzJf dCBnZW1faGFuZGxlLAogCQkgICAgICAgdWludDMyX3Qgb2Zmc2V0LCB1aW50MzJfdCBzaXplLAot CQkgICAgICAgaW50IHcsIGludCBoLCB1bnNpZ25lZCBpbnQgc3RyaWRlKQorCQkgICAgICAgaW50 IGhlaWdodCwgdW5zaWduZWQgaW50IGNjc19zdHJpZGUpCiB7CisJdW5zaWduZWQgaW50IGhhbGZf aGVpZ2h0LCBjY3NfaGFsZl9oZWlnaHQ7CiAJdWludDhfdCAqcHRyOwotCWludCB4LCB5OworCWlu dCBpOworCisJaGFsZl9oZWlnaHQgPSBBTElHTihoZWlnaHQsIDEyOCkgLyAyOworCWNjc19oYWxm X2hlaWdodCA9IGhhbGZfaGVpZ2h0IC8gMTY7CiAKIAlwdHIgPSBnZW1fbW1hcF9fY3B1KGRhdGEt PmRybV9mZCwgZ2VtX2hhbmRsZSwKIAkJCSAgICBvZmZzZXQsIHNpemUsCiAJCQkgICAgUFJPVF9S RUFEIHwgUFJPVF9XUklURSk7CiAKLQkvKiBNYXJrIHVwcGVyIGhhbGYgYXMgY29tcHJlc3NlZCAq LwotCWZvciAoeCA9IDAgOyB4IDwgdzsgeCsrKQotCQlmb3IgKHkgPSAwIDsgeSA8PSBoIC8gMjsg eSsrKQotCQkJKmNjc19wdHIocHRyLCB4LCB5LCBzdHJpZGUpID0gMHg1NTsKKwlmb3IgKGkgPSAw OyBpIDwgc2l6ZTsgaSsrKSB7CisJCWlmICh5X3RpbGVfeV9wb3MoaSwgY2NzX3N0cmlkZSkgPCBj Y3NfaGFsZl9oZWlnaHQpCisJCQlwdHJbaV0gPSBDQ1NfVU5DT01QUkVTU0VEOworCQllbHNlCisJ CQlwdHJbaV0gPSBDQ1NfQ09NUFJFU1NFRDsKKwl9CiAKIAltdW5tYXAocHRyLCBzaXplKTsKIH0K QEAgLTE0MywxMiArMTY4LDI2IEBAIHN0YXRpYyB2b2lkIGRpc3BsYXlfZmIoZGF0YV90ICpkYXRh LCBpbnQgY29tcHJlc3NlZCkKIAlzaXplWzBdID0gZi5waXRjaGVzWzBdICogQUxJR04oaGVpZ2h0 LCAzMik7CiAKIAlpZiAoY29tcHJlc3NlZCkgewotCQl3aWR0aCA9IEFMSUdOKGYud2lkdGgsIDE2 KSAvIDE2OwotCQloZWlnaHQgPSBBTElHTihmLmhlaWdodCwgOCkgLyA4OwotCQlmLnBpdGNoZXNb MV0gPSBBTElHTih3aWR0aCAqIDEsIDY0KTsKKwkJLyogRnJvbSB0aGUgU2t5IExha2UgUFJNLCBW b2wgMTIsICJDb2xvciBDb250cm9sIFN1cmZhY2UiOgorCQkgKgorCQkgKiAgICAiVGhlIGNvbXBy ZXNzaW9uIHN0YXRlIG9mIHRoZSBjYWNoZS1saW5lIHBhaXIgaXMKKwkJICogICAgc3BlY2lmaWVk IGJ5IDIgYml0cyBpbiB0aGUgQ0NTLiAgRWFjaCBDQ1MgY2FjaGUtbGluZQorCQkgKiAgICByZXBy ZXNlbnRzIGFuIGFyZWEgb24gdGhlIG1haW4gc3VyZmFjZSBvZiAxNngxNiBzZXRzCisJCSAqICAg IG9mIDEyOCBieXRlIFktdGlsZWQgY2FjaGUtbGluZS1wYWlycy4gQ0NTIGlzIGFsd2F5cyBZCisJ CSAqICAgIHRpbGVkLiIKKwkJICoKKwkJICogQSAiY2FjaGUtbGluZS1wYWlyIiBmb3IgYSBZLXRp bGVkIHN1cmZhY2UgaXMgdHdvCisJCSAqIGhvcml6b250YWxseSBhZGphY2VudCBjYWNoZSBsaW5l cy4gIFdoZW4gb3BlcmF0aW5nIGluCisJCSAqIGJ5dGVzIGFuZCByb3dzLCB0aGlzIGdpdmVzIHVz IGEgc2NhbGUtZG93biBmYWN0b3Igb2YKKwkJICogMzJ4MTYuICBTaW5jZSB0aGUgbWFpbiBzdXJm YWNlIGhhcyBhIDMyLWJpdCBmb3JtYXQsIHdlCisJCSAqIG5lZWQgdG8gbXVsdGlwbHkgd2lkdGgg YnkgNCB0byBnZXQgYnl0ZXMuCisJCSAqLworCQl3aWR0aCA9IEFMSUdOKGYud2lkdGggKiA0LCAz MikgLyAzMjsKKwkJaGVpZ2h0ID0gQUxJR04oZi5oZWlnaHQsIDE2KSAvIDE2OworCQlmLnBpdGNo ZXNbMV0gPSBBTElHTih3aWR0aCAqIDEsIDEyOCk7CiAJCWYubW9kaWZpZXJbMV0gPSBtb2RpZmll cjsKIAkJZi5vZmZzZXRzWzFdID0gc2l6ZVswXTsKLQkJc2l6ZVsxXSA9IGYucGl0Y2hlc1sxXSAq IEFMSUdOKGhlaWdodCwgNjQpOworCQlzaXplWzFdID0gZi5waXRjaGVzWzFdICogQUxJR04oaGVp Z2h0LCAzMik7CiAKIAkJZi5oYW5kbGVzWzBdID0gZ2VtX2NyZWF0ZShkYXRhLT5kcm1fZmQsIHNp emVbMF0gKyBzaXplWzFdKTsKIAkJZi5oYW5kbGVzWzFdID0gZi5oYW5kbGVzWzBdOwpAQCAtMTc2 LDExICsyMTUsMTEgQEAgc3RhdGljIHZvaWQgZGlzcGxheV9mYihkYXRhX3QgKmRhdGEsIGludCBj b21wcmVzc2VkKQogCWZiLT5jYWlyb19zdXJmYWNlID0gTlVMTDsKIAlmYi0+ZG9tYWluID0gMDsK IAotCXJlbmRlcl9mYihkYXRhLCBjb21wcmVzc2VkKTsKKwlyZW5kZXJfZmIoZGF0YSwgY29tcHJl c3NlZCwgZi5oZWlnaHQsIGYucGl0Y2hlc1swXSk7CiAKIAlpZiAoY29tcHJlc3NlZCkKIAkJcmVu ZGVyX2NjcyhkYXRhLCBmLmhhbmRsZXNbMF0sIGYub2Zmc2V0c1sxXSwgc2l6ZVsxXSwKLQkJCSAg IGYud2lkdGgvMTYsIGYuaGVpZ2h0LzgsIGYucGl0Y2hlc1sxXSk7CisJCQkgICBmLmhlaWdodCwg Zi5waXRjaGVzWzFdKTsKIAogCXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKGRh dGEtPm91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAJaWd0X3BsYW5lX3NldF9mYihw cmltYXJ5LCBmYik7Ci0tIAoyLjUuMC40MDAuZ2ZmODZmYWYKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=