From: Ben Widawsky Subject: [PATCH v2 2/3] drm: Create a format/modifier blob Date: Tue, 16 May 2017 14:31:25 -0700 Message-ID: <20170516213126.8269-2-ben@bwidawsk.net> References: <20170516213126.8269-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170516213126.8269-1-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel GFX , DRI Development Cc: Liviu Dudau , Ben Widawsky , "Kristian H . Kristensen" , Daniel Stone List-Id: dri-devel@lists.freedesktop.org VXBkYXRlZCBibG9iIGxheW91dCAoUm9iLCBEYW5pZWwsIEtyaXN0aWFuLCB4ZXJwaSkKCnYyOgoq IFJlbW92ZWQgX19wYWNrZWQsIGFuZCBhbGlnbm1lbnQgKC4rKQoqIEZpeCBpbmRlbnQgaW4gZHJt X2Zvcm1hdF9tb2RpZmllciBmaWVsZHMgKExpdml1KQoqIFJlbW92ZSBkdXBsaWNhdGVkIG1vZGlm aWVyID4gNjQgY2hlY2sgKExpdml1KQoqIENoYW5nZSBjb21tZW50IGFib3V0IG1vZGlmaWVyIChM aXZpdSkKKiBSZW1vdmUgYXJndW1lbnRzIHRvIGJsb2IgY3JlYXRpb24sIHVzZSBwbGFuZSBpbnN0 ZWFkIChMaXZpdSkKKiBGaXggZGF0YSB0eXBlcyAoQmVuKQoqIE1ha2UgdGhlIGJsb2IgcGFydCBv ZiB1YXBpIChEYW5pZWwpCgpDYzogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29tPgpDYzog RGFuaWVsIFN0b25lIDxkYW5pZWxzQGNvbGxhYm9yYS5jb20+CkNjOiBLcmlzdGlhbiBILiBLcmlz dGVuc2VuIDxob2Vnc2JlcmdAZ21haWwuY29tPgpDYzogTGl2aXUgRHVkYXUgPGxpdml1QGR1ZGF1 LmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClJl dmlld2VkLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMgfCAgNyArKysKIGRyaXZlcnMvZ3B1L2RybS9k cm1fcGxhbmUuYyAgICAgICB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmggICAgIHwgIDYgKysrCiBpbmNsdWRl L3VhcGkvZHJtL2RybV9tb2RlLmggICAgICAgfCA1MCArKysrKysrKysrKysrKysrKysrKysrCiA0 IGZpbGVzIGNoYW5nZWQsIDE1MiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZp Zy5jCmluZGV4IGQ5ODYyMjU5YTJhNy4uNmJmYmMzODM5ZGY1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rl X2NvbmZpZy5jCkBAIC0zMzcsNiArMzM3LDEzIEBAIHN0YXRpYyBpbnQgZHJtX21vZGVfY3JlYXRl X3N0YW5kYXJkX3Byb3BlcnRpZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuIC1F Tk9NRU07CiAJZGV2LT5tb2RlX2NvbmZpZy5nYW1tYV9sdXRfc2l6ZV9wcm9wZXJ0eSA9IHByb3A7 CiAKKwlwcm9wID0gZHJtX3Byb3BlcnR5X2NyZWF0ZShkZXYsCisJCQkJICAgRFJNX01PREVfUFJP UF9JTU1VVEFCTEUgfCBEUk1fTU9ERV9QUk9QX0JMT0IsCisJCQkJICAgIklOX0ZPUk1BVFMiLCAw KTsKKwlpZiAoIXByb3ApCisJCXJldHVybiAtRU5PTUVNOworCWRldi0+bW9kZV9jb25maWcubW9k aWZpZXJzID0gcHJvcDsKKwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKaW5kZXggMjAy MDM4NzFlMDZkLi5mNWIwMzJiNWY3NjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f cGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKQEAgLTYyLDYgKzYyLDky IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZHJtX251bV9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlyZXR1cm4gbnVtOwogfQogCitzdGF0aWMgaW5saW5lIHUzMiAqCitmb3JtYXRzX3B0 cihzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllcl9ibG9iICpibG9iKQoreworCXJldHVybiAodTMy ICopKCgoY2hhciAqKWJsb2IpICsgYmxvYi0+Zm9ybWF0c19vZmZzZXQpOworfQorCitzdGF0aWMg aW5saW5lIHN0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVyICoKK21vZGlmaWVyc19wdHIoc3RydWN0 IGRybV9mb3JtYXRfbW9kaWZpZXJfYmxvYiAqYmxvYikKK3sKKwlyZXR1cm4gKHN0cnVjdCBkcm1f Zm9ybWF0X21vZGlmaWVyICopKCgoY2hhciAqKWJsb2IpICsgYmxvYi0+bW9kaWZpZXJzX29mZnNl dCk7Cit9CisKK3N0YXRpYyBpbnQgY3JlYXRlX2luX2Zvcm1hdF9ibG9iKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQoreworCWNvbnN0IHN0cnVjdCBkcm1f bW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOworCWNvbnN0IHVpbnQ2NF90 ICp0ZW1wX21vZGlmaWVycyA9IHBsYW5lLT5tb2RpZmllcnM7CisJdW5zaWduZWQgaW50IGZvcm1h dF9tb2RpZmllcl9jb3VudCA9IDA7CisJc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpibG9iID0g TlVMTDsKKwlzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllciAqbW9kOworCXNpemVfdCBibG9iX3Np emUgPSAwLCBmb3JtYXRzX3NpemUsIG1vZGlmaWVyc19zaXplOworCXN0cnVjdCBkcm1fZm9ybWF0 X21vZGlmaWVyX2Jsb2IgKmJsb2JfZGF0YTsKKwlpbnQgaSwgaiwgcmV0ID0gMDsKKworCWlmIChw bGFuZS0+bW9kaWZpZXJzKQorCQl3aGlsZSAoKnRlbXBfbW9kaWZpZXJzKysgIT0gRFJNX0ZPUk1B VF9NT0RfSU5WQUxJRCkKKwkJCWZvcm1hdF9tb2RpZmllcl9jb3VudCsrOworCisJZm9ybWF0c19z aXplID0gc2l6ZW9mKCpwbGFuZS0+Zm9ybWF0X3R5cGVzKSAqIHBsYW5lLT5mb3JtYXRfY291bnQ7 CisJaWYgKFdBUk5fT04oIWZvcm1hdHNfc2l6ZSkpIHsKKwkJLyogMCBmb3JtYXRzIGFyZSBuZXZl ciBleHBlY3RlZCAqLworCQlyZXR1cm4gMDsKKwl9CisKKwltb2RpZmllcnNfc2l6ZSA9CisJCXNp emVvZihzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllcikgKiBmb3JtYXRfbW9kaWZpZXJfY291bnQ7 CisKKwlibG9iX3NpemUgPSBzaXplb2Yoc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXJfYmxvYik7 CisJYmxvYl9zaXplICs9IEFMSUdOKGZvcm1hdHNfc2l6ZSwgOCk7CisJYmxvYl9zaXplICs9IG1v ZGlmaWVyc19zaXplOworCisJYmxvYiA9IGRybV9wcm9wZXJ0eV9jcmVhdGVfYmxvYihkZXYsIGJs b2Jfc2l6ZSwgTlVMTCk7CisJaWYgKElTX0VSUihibG9iKSkKKwkJcmV0dXJuIC0xOworCisJYmxv Yl9kYXRhID0gKHN0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVyX2Jsb2IgKilibG9iLT5kYXRhOwor CWJsb2JfZGF0YS0+dmVyc2lvbiA9IEZPUk1BVF9CTE9CX0NVUlJFTlQ7CisJYmxvYl9kYXRhLT5j b3VudF9mb3JtYXRzID0gcGxhbmUtPmZvcm1hdF9jb3VudDsKKwlibG9iX2RhdGEtPmZvcm1hdHNf b2Zmc2V0ID0gc2l6ZW9mKHN0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVyX2Jsb2IpOworCWJsb2Jf ZGF0YS0+Y291bnRfbW9kaWZpZXJzID0gZm9ybWF0X21vZGlmaWVyX2NvdW50OworCisJLyogTW9k aWZpZXJzIG9mZnNldCBpcyBhIHBvaW50ZXIgdG8gYSBzdHJ1Y3Qgd2l0aCBhIDY0IGJpdCBmaWVs ZCBzbyBpdAorCSAqIHNob3VsZCBiZSBuYXR1cmFsbHkgYWxpZ25lZCB0byA4Qi4KKwkgKi8KKwli bG9iX2RhdGEtPm1vZGlmaWVyc19vZmZzZXQgPQorCQlBTElHTihibG9iX2RhdGEtPmZvcm1hdHNf b2Zmc2V0ICsgZm9ybWF0c19zaXplLCA4KTsKKworCW1lbWNweShmb3JtYXRzX3B0cihibG9iX2Rh dGEpLCBwbGFuZS0+Zm9ybWF0X3R5cGVzLCBmb3JtYXRzX3NpemUpOworCisJLyogSWYgd2UgY2Fu J3QgZGV0ZXJtaW5lIHN1cHBvcnQsIGp1c3QgYmFpbCAqLworCWlmICghcGxhbmUtPmZ1bmNzLT5m b3JtYXRfbW9kX3N1cHBvcnRlZCkKKwkJZ290byBkb25lOworCisJbW9kID0gbW9kaWZpZXJzX3B0 cihibG9iX2RhdGEpOworCWZvciAoaSA9IDA7IGkgPCBmb3JtYXRfbW9kaWZpZXJfY291bnQ7IGkr KykgeworCQlmb3IgKGogPSAwOyBqIDwgcGxhbmUtPmZvcm1hdF9jb3VudDsgaisrKSB7CisJCQlp ZiAocGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9kX3N1cHBvcnRlZChwbGFuZSwKKwkJCQkJCQkgICAg ICAgcGxhbmUtPmZvcm1hdF90eXBlc1tqXSwKKwkJCQkJCQkgICAgICAgcGxhbmUtPm1vZGlmaWVy c1tpXSkpIHsKKworCQkJCW1vZC0+Zm9ybWF0cyB8PSAxIDw8IGo7CisJCQl9CisJCX0KKworCQlt b2QtPm1vZGlmaWVyID0gcGxhbmUtPm1vZGlmaWVyc1tpXTsKKwkJbW9kLT5vZmZzZXQgPSAwOwor CQltb2QtPnBhZCA9IDA7CisJCW1vZCsrOworCX0KKworZG9uZToKKwlkcm1fb2JqZWN0X2F0dGFj aF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsIGNvbmZpZy0+bW9kaWZpZXJzLAorCQkJCSAgIGJsb2It PmJhc2UuaWQpOworCisJcmV0dXJuIHJldDsKK30KKwogLyoqCiAgKiBkcm1fdW5pdmVyc2FsX3Bs YW5lX2luaXQgLSBJbml0aWFsaXplIGEgbmV3IHVuaXZlcnNhbCBwbGFuZSBvYmplY3QKICAqIEBk ZXY6IERSTSBkZXZpY2UKQEAgLTE4MCw2ICsyNjYsOSBAQCBpbnQgZHJtX3VuaXZlcnNhbF9wbGFu ZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmcGxhbmUtPmJhc2UsIGNvbmZpZy0+cHJvcF9z cmNfaCwgMCk7CiAJfQogCisJaWYgKGNvbmZpZy0+YWxsb3dfZmJfbW9kaWZpZXJzKQorCQljcmVh dGVfaW5fZm9ybWF0X2Jsb2IoZGV2LCBwbGFuZSk7CisKIAlyZXR1cm4gMDsKIH0KIEVYUE9SVF9T WU1CT0woZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9tb2RlX2NvbmZpZy5oIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgKaW5kZXgg NDI5ODE3MTExODliLi4wMzc3NmU2NTk4MTEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9t b2RlX2NvbmZpZy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9tb2RlX2NvbmZpZy5oCkBAIC03NTcs NiArNzU3LDEyIEBAIHN0cnVjdCBkcm1fbW9kZV9jb25maWcgewogCSAqLwogCWJvb2wgYWxsb3df ZmJfbW9kaWZpZXJzOwogCisJLyoqCisJICogQG1vZGlmaWVyczogUGxhbmUgcHJvcGVydHkgdG8g bGlzdCBzdXBwb3J0IG1vZGlmaWVyL2Zvcm1hdAorCSAqIGNvbWJpbmF0aW9uLgorCSAqLworCXN0 cnVjdCBkcm1fcHJvcGVydHkgKm1vZGlmaWVyczsKKwogCS8qIGN1cnNvciBzaXplICovCiAJdWlu dDMyX3QgY3Vyc29yX3dpZHRoLCBjdXJzb3JfaGVpZ2h0OwogCmRpZmYgLS1naXQgYS9pbmNsdWRl L3VhcGkvZHJtL2RybV9tb2RlLmggYi9pbmNsdWRlL3VhcGkvZHJtL2RybV9tb2RlLmgKaW5kZXgg OGM2N2ZjMDNkNTNkLi43YWQ1Njc5MDNmZGMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0v ZHJtX21vZGUuaAorKysgYi9pbmNsdWRlL3VhcGkvZHJtL2RybV9tb2RlLmgKQEAgLTY2NSw2ICs2 NjUsNTYgQEAgc3RydWN0IGRybV9tb2RlX2F0b21pYyB7CiAJX191NjQgdXNlcl9kYXRhOwogfTsK IAorc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXJfYmxvYiB7CisjZGVmaW5lIEZPUk1BVF9CTE9C X0NVUlJFTlQgMQorCS8qIFZlcnNpb24gb2YgdGhpcyBibG9iIGZvcm1hdCAqLworCXUzMiB2ZXJz aW9uOworCisJLyogRmxhZ3MgKi8KKwl1MzIgZmxhZ3M7CisKKwkvKiBOdW1iZXIgb2YgZm91cmNj IGZvcm1hdHMgc3VwcG9ydGVkICovCisJdTMyIGNvdW50X2Zvcm1hdHM7CisKKwkvKiBXaGVyZSBp biB0aGlzIGJsb2IgdGhlIGZvcm1hdHMgZXhpc3QgKGluIGJ5dGVzKSAqLworCXUzMiBmb3JtYXRz X29mZnNldDsKKworCS8qIE51bWJlciBvZiBkcm1fZm9ybWF0X21vZGlmaWVycyAqLworCXUzMiBj b3VudF9tb2RpZmllcnM7CisKKwkvKiBXaGVyZSBpbiB0aGlzIGJsb2IgdGhlIG1vZGlmaWVycyBl eGlzdCAoaW4gYnl0ZXMpICovCisJdTMyIG1vZGlmaWVyc19vZmZzZXQ7CisKKwkvKiB1MzIgZm9y bWF0c1tdICovCisJLyogc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXIgbW9kaWZpZXJzW10gKi8K K307CisKK3N0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVyIHsKKwkvKiBCaXRtYXNrIG9mIGZvcm1h dHMgaW4gZ2V0X3BsYW5lIGZvcm1hdCBsaXN0IHRoaXMgaW5mbyBhcHBsaWVzIHRvLiBUaGUKKwkg KiBvZmZzZXQgYWxsb3dzIGEgc2xpZGluZyB3aW5kb3cgb2Ygd2hpY2ggNjQgZm9ybWF0cyAoYml0 cykuCisJICoKKwkgKiBTb21lIGV4YW1wbGVzOgorCSAqIEluIHRvZGF5J3Mgd29ybGQgd2l0aCA8 IDY1IGZvcm1hdHMsIGFuZCBmb3JtYXRzIDAsIGFuZCAyIGFyZQorCSAqIHN1cHBvcnRlZAorCSAq IDB4MDAwMDAwMDAwMDAwMDAwNQorCSAqCQkgIF4tb2Zmc2V0ID0gMCwgZm9ybWF0cyA9IDUKKwkg KgorCSAqIElmIHRoZSBudW1iZXIgZm9ybWF0cyBncmV3IHRvIDEyOCwgYW5kIGZvcm1hdHMgOTgt MTAyIGFyZQorCSAqIHN1cHBvcnRlZCB3aXRoIHRoZSBtb2RpZmllcjoKKwkgKgorCSAqIDB4MDAw MDAwM2MwMDAwMDAwMCAwMDAwMDAwMDAwMDAwMDAwCisJICoJCSAgXgorCSAqCQkgIHxfX29mZnNl dCA9IDY0LCBmb3JtYXRzID0gMHgzYzAwMDAwMDAwCisJICoKKwkgKi8KKwlfX3U2NCBmb3JtYXRz OworCV9fdTMyIG9mZnNldDsKKwlfX3UzMiBwYWQ7CisKKwkvKiBUaGUgbW9kaWZpZXIgdGhhdCBh cHBsaWVzIHRvIHRoZSA+Z2V0X3BsYW5lIGZvcm1hdCBsaXN0IGJpdG1hc2suICovCisJX191NjQg bW9kaWZpZXI7Cit9OworCiAvKioKICAqIENyZWF0ZSBhIG5ldyAnYmxvYicgZGF0YSBwcm9wZXJ0 eSwgY29weWluZyBsZW5ndGggYnl0ZXMgZnJvbSBkYXRhIHBvaW50ZXIsCiAgKiBhbmQgcmV0dXJu aW5nIG5ldyBibG9iIElELgotLSAKMi4xMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK