From: Ben Widawsky Subject: [PATCH 2/4] drm: Create a format/modifier blob Date: Fri, 23 Jun 2017 09:45:42 -0700 Message-ID: <20170623164544.7362-3-ben@bwidawsk.net> References: <20170623164544.7362-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170623164544.7362-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: DRI Development , Intel GFX Cc: Liviu Dudau , Ben Widawsky , Daniel Stone , "Kristian H . Kristensen" List-Id: dri-devel@lists.freedesktop.org VXBkYXRlZCBibG9iIGxheW91dCAoUm9iLCBEYW5pZWwsIEtyaXN0aWFuLCB4ZXJwaSkKCnYyOgoq IFJlbW92ZWQgX19wYWNrZWQsIGFuZCBhbGlnbm1lbnQgKC4rKQoqIEZpeCBpbmRlbnQgaW4gZHJt X2Zvcm1hdF9tb2RpZmllciBmaWVsZHMgKExpdml1KQoqIFJlbW92ZSBkdXBsaWNhdGVkIG1vZGlm aWVyID4gNjQgY2hlY2sgKExpdml1KQoqIENoYW5nZSBjb21tZW50IGFib3V0IG1vZGlmaWVyIChM aXZpdSkKKiBSZW1vdmUgYXJndW1lbnRzIHRvIGJsb2IgY3JlYXRpb24sIHVzZSBwbGFuZSBpbnN0 ZWFkIChMaXZpdSkKKiBGaXggZGF0YSB0eXBlcyAoQmVuKQoqIE1ha2UgdGhlIGJsb2IgcGFydCBv ZiB1YXBpIChEYW5pZWwpCgp2MzoKUmVtb3ZlIHVudXNlZCByZXQgZmllbGQuCkNoYW5nZSBpLCBh bmQgaiB0byB1bnNpZ25lZCBpbnQgKEVtaWwpCgp2NDoKVXNlIHBsYW5lLT5tb2RpZmllcl9jb3Vu dCBpbnN0ZWFkIG9mIHJlY291bnRpbmcgKERhbmllbCkKCkNjOiBSb2IgQ2xhcmsgPHJvYmRjbGFy a0BnbWFpbC5jb20+CkNjOiBLcmlzdGlhbiBILiBLcmlzdGVuc2VuIDxob2Vnc2JlcmdAZ21haWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClJldmll d2VkLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4gKHYyKQpSZXZpZXdl ZC1ieTogTGl2aXUgRHVkYXUgPGxpdml1QGR1ZGF1LmNvLnVrPiAodjIpClJldmlld2VkLWJ5OiBF bWlsIFZlbGlrb3YgPGVtaWwubC52ZWxpa292QGdtYWlsLmNvbT4gKHYzKQotLS0KIGRyaXZlcnMv Z3B1L2RybS9kcm1fbW9kZV9jb25maWcuYyB8ICA3ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9kcm1f cGxhbmUuYyAgICAgICB8IDgzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KwogaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmggICAgIHwgIDYgKysrCiBpbmNsdWRlL3Vh cGkvZHJtL2RybV9tb2RlLmggICAgICAgfCA1MCArKysrKysrKysrKysrKysrKysrKysrKwogNCBm aWxlcyBjaGFuZ2VkLCAxNDYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fbW9kZV9jb25maWcuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcu YwppbmRleCBkOTg2MjI1OWEyYTcuLjZiZmJjMzgzOWRmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9j b25maWcuYwpAQCAtMzM3LDYgKzMzNywxMyBAQCBzdGF0aWMgaW50IGRybV9tb2RlX2NyZWF0ZV9z dGFuZGFyZF9wcm9wZXJ0aWVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybiAtRU5P TUVNOwogCWRldi0+bW9kZV9jb25maWcuZ2FtbWFfbHV0X3NpemVfcHJvcGVydHkgPSBwcm9wOwog CisJcHJvcCA9IGRybV9wcm9wZXJ0eV9jcmVhdGUoZGV2LAorCQkJCSAgIERSTV9NT0RFX1BST1Bf SU1NVVRBQkxFIHwgRFJNX01PREVfUFJPUF9CTE9CLAorCQkJCSAgICJJTl9GT1JNQVRTIiwgMCk7 CisJaWYgKCFwcm9wKQorCQlyZXR1cm4gLUVOT01FTTsKKwlkZXYtPm1vZGVfY29uZmlnLm1vZGlm aWVycyA9IHByb3A7CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jCmluZGV4IGQzZmM1 NjFkN2I0OC4uOGEyZDU3NjU4MzdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3Bs YW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jCkBAIC02Miw2ICs2Miw4NiBA QCBzdGF0aWMgdW5zaWduZWQgaW50IGRybV9udW1fcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJcmV0dXJuIG51bTsKIH0KIAorc3RhdGljIGlubGluZSB1MzIgKgorZm9ybWF0c19wdHIo c3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXJfYmxvYiAqYmxvYikKK3sKKwlyZXR1cm4gKHUzMiAq KSgoKGNoYXIgKilibG9iKSArIGJsb2ItPmZvcm1hdHNfb2Zmc2V0KTsKK30KKworc3RhdGljIGlu bGluZSBzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllciAqCittb2RpZmllcnNfcHRyKHN0cnVjdCBk cm1fZm9ybWF0X21vZGlmaWVyX2Jsb2IgKmJsb2IpCit7CisJcmV0dXJuIChzdHJ1Y3QgZHJtX2Zv cm1hdF9tb2RpZmllciAqKSgoKGNoYXIgKilibG9iKSArIGJsb2ItPm1vZGlmaWVyc19vZmZzZXQp OworfQorCitzdGF0aWMgaW50IGNyZWF0ZV9pbl9mb3JtYXRfYmxvYihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX21v ZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2RlX2NvbmZpZzsKKwlzdHJ1Y3QgZHJtX3Byb3Bl cnR5X2Jsb2IgKmJsb2I7CisJc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXIgKm1vZDsKKwlzaXpl X3QgYmxvYl9zaXplLCBmb3JtYXRzX3NpemUsIG1vZGlmaWVyc19zaXplOworCXN0cnVjdCBkcm1f Zm9ybWF0X21vZGlmaWVyX2Jsb2IgKmJsb2JfZGF0YTsKKwl1bnNpZ25lZCBpbnQgaSwgajsKKwor CWZvcm1hdHNfc2l6ZSA9IHNpemVvZigqcGxhbmUtPmZvcm1hdF90eXBlcykgKiBwbGFuZS0+Zm9y bWF0X2NvdW50OworCWlmIChXQVJOX09OKCFmb3JtYXRzX3NpemUpKSB7CisJCS8qIDAgZm9ybWF0 cyBhcmUgbmV2ZXIgZXhwZWN0ZWQgKi8KKwkJcmV0dXJuIDA7CisJfQorCisJbW9kaWZpZXJzX3Np emUgPQorCQlzaXplb2Yoc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXIpICogcGxhbmUtPm1vZGlm aWVyX2NvdW50OworCisJYmxvYl9zaXplID0gc2l6ZW9mKHN0cnVjdCBkcm1fZm9ybWF0X21vZGlm aWVyX2Jsb2IpOworCS8qIE1vZGlmaWVycyBvZmZzZXQgaXMgYSBwb2ludGVyIHRvIGEgc3RydWN0 IHdpdGggYSA2NCBiaXQgZmllbGQgc28gaXQKKwkgKiBzaG91bGQgYmUgbmF0dXJhbGx5IGFsaWdu ZWQgdG8gOEIuCisJICovCisJYmxvYl9zaXplICs9IEFMSUdOKGZvcm1hdHNfc2l6ZSwgOCk7CisJ YmxvYl9zaXplICs9IG1vZGlmaWVyc19zaXplOworCisJYmxvYiA9IGRybV9wcm9wZXJ0eV9jcmVh dGVfYmxvYihkZXYsIGJsb2Jfc2l6ZSwgTlVMTCk7CisJaWYgKElTX0VSUihibG9iKSkKKwkJcmV0 dXJuIC0xOworCisJYmxvYl9kYXRhID0gKHN0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVyX2Jsb2Ig KilibG9iLT5kYXRhOworCWJsb2JfZGF0YS0+dmVyc2lvbiA9IEZPUk1BVF9CTE9CX0NVUlJFTlQ7 CisJYmxvYl9kYXRhLT5jb3VudF9mb3JtYXRzID0gcGxhbmUtPmZvcm1hdF9jb3VudDsKKwlibG9i X2RhdGEtPmZvcm1hdHNfb2Zmc2V0ID0gc2l6ZW9mKHN0cnVjdCBkcm1fZm9ybWF0X21vZGlmaWVy X2Jsb2IpOworCWJsb2JfZGF0YS0+Y291bnRfbW9kaWZpZXJzID0gcGxhbmUtPm1vZGlmaWVyX2Nv dW50OworCisJYmxvYl9kYXRhLT5tb2RpZmllcnNfb2Zmc2V0ID0KKwkJQUxJR04oYmxvYl9kYXRh LT5mb3JtYXRzX29mZnNldCArIGZvcm1hdHNfc2l6ZSwgOCk7CisKKwltZW1jcHkoZm9ybWF0c19w dHIoYmxvYl9kYXRhKSwgcGxhbmUtPmZvcm1hdF90eXBlcywgZm9ybWF0c19zaXplKTsKKworCS8q IElmIHdlIGNhbid0IGRldGVybWluZSBzdXBwb3J0LCBqdXN0IGJhaWwgKi8KKwlpZiAoIXBsYW5l LT5mdW5jcy0+Zm9ybWF0X21vZF9zdXBwb3J0ZWQpCisJCWdvdG8gZG9uZTsKKworCW1vZCA9IG1v ZGlmaWVyc19wdHIoYmxvYl9kYXRhKTsKKwlmb3IgKGkgPSAwOyBpIDwgcGxhbmUtPm1vZGlmaWVy X2NvdW50OyBpKyspIHsKKwkJZm9yIChqID0gMDsgaiA8IHBsYW5lLT5mb3JtYXRfY291bnQ7IGor KykgeworCQkJaWYgKHBsYW5lLT5mdW5jcy0+Zm9ybWF0X21vZF9zdXBwb3J0ZWQocGxhbmUsCisJ CQkJCQkJICAgICAgIHBsYW5lLT5mb3JtYXRfdHlwZXNbal0sCisJCQkJCQkJICAgICAgIHBsYW5l LT5tb2RpZmllcnNbaV0pKSB7CisKKwkJCQltb2QtPmZvcm1hdHMgfD0gMSA8PCBqOworCQkJfQor CQl9CisKKwkJbW9kLT5tb2RpZmllciA9IHBsYW5lLT5tb2RpZmllcnNbaV07CisJCW1vZC0+b2Zm c2V0ID0gMDsKKwkJbW9kLT5wYWQgPSAwOworCQltb2QrKzsKKwl9CisKK2RvbmU6CisJZHJtX29i amVjdF9hdHRhY2hfcHJvcGVydHkoJnBsYW5lLT5iYXNlLCBjb25maWctPm1vZGlmaWVycywKKwkJ CQkgICBibG9iLT5iYXNlLmlkKTsKKworCXJldHVybiAwOworfQorCiAvKioKICAqIGRybV91bml2 ZXJzYWxfcGxhbmVfaW5pdCAtIEluaXRpYWxpemUgYSBuZXcgdW5pdmVyc2FsIHBsYW5lIG9iamVj dAogICogQGRldjogRFJNIGRldmljZQpAQCAtMTgxLDYgKzI2MSw5IEBAIGludCBkcm1fdW5pdmVy c2FsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwbGFuZS0+YmFzZSwgY29uZmln LT5wcm9wX3NyY19oLCAwKTsKIAl9CiAKKwlpZiAoY29uZmlnLT5hbGxvd19mYl9tb2RpZmllcnMp CisJCWNyZWF0ZV9pbl9mb3JtYXRfYmxvYihkZXYsIHBsYW5lKTsKKwogCXJldHVybiAwOwogfQog RVhQT1JUX1NZTUJPTChkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQpOwpkaWZmIC0tZ2l0IGEvaW5j bHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmggYi9pbmNsdWRlL2RybS9kcm1fbW9kZV9jb25maWcu aAppbmRleCA0Mjk4MTcxMTE4OWIuLjAzNzc2ZTY1OTgxMSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9k cm0vZHJtX21vZGVfY29uZmlnLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgK QEAgLTc1Nyw2ICs3NTcsMTIgQEAgc3RydWN0IGRybV9tb2RlX2NvbmZpZyB7CiAJICovCiAJYm9v bCBhbGxvd19mYl9tb2RpZmllcnM7CiAKKwkvKioKKwkgKiBAbW9kaWZpZXJzOiBQbGFuZSBwcm9w ZXJ0eSB0byBsaXN0IHN1cHBvcnQgbW9kaWZpZXIvZm9ybWF0CisJICogY29tYmluYXRpb24uCisJ ICovCisJc3RydWN0IGRybV9wcm9wZXJ0eSAqbW9kaWZpZXJzOworCiAJLyogY3Vyc29yIHNpemUg Ki8KIAl1aW50MzJfdCBjdXJzb3Jfd2lkdGgsIGN1cnNvcl9oZWlnaHQ7CiAKZGlmZiAtLWdpdCBh L2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaCBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUu aAppbmRleCA0MDMzMzlmOThhOTIuLmEyYmI3MTYxZjAyMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS91 YXBpL2RybS9kcm1fbW9kZS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaApAQCAt NzEyLDYgKzcxMiw1NiBAQCBzdHJ1Y3QgZHJtX21vZGVfYXRvbWljIHsKIAlfX3U2NCB1c2VyX2Rh dGE7CiB9OwogCitzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllcl9ibG9iIHsKKyNkZWZpbmUgRk9S TUFUX0JMT0JfQ1VSUkVOVCAxCisJLyogVmVyc2lvbiBvZiB0aGlzIGJsb2IgZm9ybWF0ICovCisJ dTMyIHZlcnNpb247CisKKwkvKiBGbGFncyAqLworCXUzMiBmbGFnczsKKworCS8qIE51bWJlciBv ZiBmb3VyY2MgZm9ybWF0cyBzdXBwb3J0ZWQgKi8KKwl1MzIgY291bnRfZm9ybWF0czsKKworCS8q IFdoZXJlIGluIHRoaXMgYmxvYiB0aGUgZm9ybWF0cyBleGlzdCAoaW4gYnl0ZXMpICovCisJdTMy IGZvcm1hdHNfb2Zmc2V0OworCisJLyogTnVtYmVyIG9mIGRybV9mb3JtYXRfbW9kaWZpZXJzICov CisJdTMyIGNvdW50X21vZGlmaWVyczsKKworCS8qIFdoZXJlIGluIHRoaXMgYmxvYiB0aGUgbW9k aWZpZXJzIGV4aXN0IChpbiBieXRlcykgKi8KKwl1MzIgbW9kaWZpZXJzX29mZnNldDsKKworCS8q IHUzMiBmb3JtYXRzW10gKi8KKwkvKiBzdHJ1Y3QgZHJtX2Zvcm1hdF9tb2RpZmllciBtb2RpZmll cnNbXSAqLworfTsKKworc3RydWN0IGRybV9mb3JtYXRfbW9kaWZpZXIgeworCS8qIEJpdG1hc2sg b2YgZm9ybWF0cyBpbiBnZXRfcGxhbmUgZm9ybWF0IGxpc3QgdGhpcyBpbmZvIGFwcGxpZXMgdG8u IFRoZQorCSAqIG9mZnNldCBhbGxvd3MgYSBzbGlkaW5nIHdpbmRvdyBvZiB3aGljaCA2NCBmb3Jt YXRzIChiaXRzKS4KKwkgKgorCSAqIFNvbWUgZXhhbXBsZXM6CisJICogSW4gdG9kYXkncyB3b3Js ZCB3aXRoIDwgNjUgZm9ybWF0cywgYW5kIGZvcm1hdHMgMCwgYW5kIDIgYXJlCisJICogc3VwcG9y dGVkCisJICogMHgwMDAwMDAwMDAwMDAwMDA1CisJICoJCSAgXi1vZmZzZXQgPSAwLCBmb3JtYXRz ID0gNQorCSAqCisJICogSWYgdGhlIG51bWJlciBmb3JtYXRzIGdyZXcgdG8gMTI4LCBhbmQgZm9y bWF0cyA5OC0xMDIgYXJlCisJICogc3VwcG9ydGVkIHdpdGggdGhlIG1vZGlmaWVyOgorCSAqCisJ ICogMHgwMDAwMDAzYzAwMDAwMDAwIDAwMDAwMDAwMDAwMDAwMDAKKwkgKgkJICBeCisJICoJCSAg fF9fb2Zmc2V0ID0gNjQsIGZvcm1hdHMgPSAweDNjMDAwMDAwMDAKKwkgKgorCSAqLworCV9fdTY0 IGZvcm1hdHM7CisJX191MzIgb2Zmc2V0OworCV9fdTMyIHBhZDsKKworCS8qIFRoZSBtb2RpZmll ciB0aGF0IGFwcGxpZXMgdG8gdGhlID5nZXRfcGxhbmUgZm9ybWF0IGxpc3QgYml0bWFzay4gKi8K KwlfX3U2NCBtb2RpZmllcjsKK307CisKIC8qKgogICogQ3JlYXRlIGEgbmV3ICdibG9iJyBkYXRh IHByb3BlcnR5LCBjb3B5aW5nIGxlbmd0aCBieXRlcyBmcm9tIGRhdGEgcG9pbnRlciwKICAqIGFu ZCByZXR1cm5pbmcgbmV3IGJsb2IgSUQuCi0tIAoyLjEzLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=