From: Matt Roper Subject: [CI v5 2/2] drm/i915/vbt: Handle generic DTD block Date: Fri, 15 Nov 2019 08:51:32 -0800 Message-ID: <20191115165132.9472-3-matthew.d.roper@intel.com> References: <20191115165132.9472-1-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B5AC46E610 for ; Fri, 15 Nov 2019 16:50:33 +0000 (UTC) In-Reply-To: <20191115165132.9472-1-matthew.d.roper@intel.com> 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: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org VkJUIHJldmlzaW9uIDIyOSBhZGRzIGEgbmV3ICJHZW5lcmljIERURCIgYmxvY2sgNTggYW5kIGRl cHJlY2F0ZXMgdGhlCm9sZCBMRlAgcGFuZWwgbW9kZSBkYXRhIGluIGJsb2NrIDQyLiAgTGV0J3Mg c3RhcnQgcGFyc2luZyB0aGlzIGJsb2NrIHRvCmZpbGwgaW4gdGhlIHBhbmVsIGZpeGVkIG1vZGUg b24gZGV2aWNlcyB3aXRoIGEgPj0yMjkgVkJULgoKdjI6CiAqIFVwZGF0ZSBhY2NvcmRpbmcgdG8g dGhlIHJlY2VudCB1cGRhdGVzOgogICAgLSBEVEQgc2l6ZSBpcyBub3cgMTYgYml0cyBpbnN0ZWFk IG9mIDI0CiAgICAtIHBvbGFyaXR5IGlzIG5vdyBqdXN0IGEgc2luZ2xlIGJpdCBmb3IgaHN5bmMg YW5kIHZzeW5jIGFuZCBpcwogICAgICBwcm9wZXJseSBkb2N1bWVudGVkCiAqIE1pbm9yIGNoZWNr cGF0Y2ggZml4Cgp2MzoKICogTm93IHRoYXQgcGFuZWwgb3B0aW9ucyBhcmUgcGFyc2VkIHNlcGFy YXRlbHkgZnJvbSB0aGUgcHJldmlvdXMgcGF0Y2gsCiAgIG1vdmUgZ2VuZXJpYyBEVEQgcGFyc2lu ZyBpbnRvIGEgZnVuY3Rpb24gcGFyYWxsZWwgdG8KICAgcGFyc2VfbGZwX3BhbmVsX2R0ZC4gIFdl J2xsIHN0aWxsIGZhbGwgYmFjayB0byBsb29raW5nIGF0IHRoZSBsZWdhY3kKICAgTFZEUyB0aW1p bmcgYmxvY2sgaWYgdGhlIGdlbmVyaWMgRFREIGZhaWxzLiAgKEphbmkpCiAqIERvbid0IGZvcmdl dCB0byBhY3R1YWxseSBzZXQgbGZwX2x2ZHNfdmJ0X21vZGUhICAoSmFuaSkKICogRHJvcCAiYmRi XyIgcHJlZml4IGZyb20gZHRkIGVudHJ5IHN0cnVjdHVyZS4gIChKYW5pKQogKiBGb2xsb3cgQzk5 IHN0YW5kYXJkIGZvciBzdHJ1Y3R1cmUncyBmbGV4aWJsZSBhcnJheSBtZW1iZXIuICAoSmFuaSkK CnY0OgogKiBBZGQgInBvc2l0aXZlIiB0byBwb2xhcml0eSBmaWVsZCBuYW1lcyBmb3IgY2xhcml0 eS4gIChKYW5pKQogKiBNb3ZlIFZCVCB2ZXJzaW9uIGNoZWNrIGFuZCBmYWxsYmFjayB0byBsZWdh Y3kgRFREIHBhcnNpbmcgbG9naWMgdG8gYQogICBoZWxwZXIgdG8ga2VlcCB0b3AtbGV2ZWwgVkJU IHBhcnNpbmcgdW5jbHV0dGVyZWQuICAoSmFuaSkKICogUmVzdHJ1Y3R1cmUgcmVzZXJ2ZWQgYml0 IHBhY2tpbmcgYXQgZW5kIG9mIGdlbmVyaWNfZHRkX2VudHJ5IGZyb20KICAgInUzMiByc3ZkOjI0 IiB0byAidTggcnN2ZFszXSIgdG8gcHJldmVudCBjb3B5L3Bhc3RlIG1pc3Rha2VzIGluIHRoZQog ICBmdXR1cmUuICAoSmFuaSkKCkJzcGVjOiA1NDc1MQpCc3BlYzogMjAxNDgKQ2M6IEphbmkgTmlr dWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1h dHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5u aWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf Ymlvcy5jICAgICB8IDk2ICsrKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfdmJ0X2RlZnMuaCB8IDMxICsrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAx MjUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYmlvcy5jCmluZGV4IGQxM2NlMGI3ZGI4Yi4uZjZhOWE1Y2NiNTU2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Jpb3MuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Jpb3MuYwpAQCAtMjk2LDcgKzI5Niw3 IEBAIHBhcnNlX2xmcF9wYW5lbF9kdGQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCiAJZGV2X3ByaXYtPnZidC5sZnBfbHZkc192YnRfbW9kZSA9IHBhbmVsX2ZpeGVkX21vZGU7 CiAKLQlEUk1fREVCVUdfS01TKCJGb3VuZCBwYW5lbCBtb2RlIGluIEJJT1MgVkJUIHRhYmxlczpc biIpOworCURSTV9ERUJVR19LTVMoIkZvdW5kIHBhbmVsIG1vZGUgaW4gQklPUyBWQlQgbGVnYWN5 IGxmcCB0YWJsZTpcbiIpOwogCWRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmUocGFuZWxfZml4 ZWRfbW9kZSk7CiAKIAlmcF90aW1pbmcgPSBnZXRfbHZkc19mcF90aW1pbmcoYmRiLCBsdmRzX2xm cF9kYXRhLApAQCAtMzEzLDYgKzMxMyw5OCBAQCBwYXJzZV9sZnBfcGFuZWxfZHRkKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiB9CiAKK3N0YXRpYyB2b2lkCitwYXJzZV9n ZW5lcmljX2R0ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgY29uc3Qg c3RydWN0IGJkYl9oZWFkZXIgKmJkYikKK3sKKwljb25zdCBzdHJ1Y3QgYmRiX2dlbmVyaWNfZHRk ICpnZW5lcmljX2R0ZDsKKwljb25zdCBzdHJ1Y3QgZ2VuZXJpY19kdGRfZW50cnkgKmR0ZDsKKwlz dHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqcGFuZWxfZml4ZWRfbW9kZTsKKwlpbnQgbnVtX2R0ZDsK KworCWdlbmVyaWNfZHRkID0gZmluZF9zZWN0aW9uKGJkYiwgQkRCX0dFTkVSSUNfRFREKTsKKwlp ZiAoIWdlbmVyaWNfZHRkKQorCQlyZXR1cm47CisKKwlpZiAoZ2VuZXJpY19kdGQtPmdkdGRfc2l6 ZSA8IHNpemVvZihzdHJ1Y3QgZ2VuZXJpY19kdGRfZW50cnkpKSB7CisJCURSTV9FUlJPUigiR0RU RCBzaXplICV1IGlzIHRvbyBzbWFsbC5cbiIsCisJCQkgIGdlbmVyaWNfZHRkLT5nZHRkX3NpemUp OworCQlyZXR1cm47CisJfSBlbHNlIGlmIChnZW5lcmljX2R0ZC0+Z2R0ZF9zaXplICE9CisJCSAg IHNpemVvZihzdHJ1Y3QgZ2VuZXJpY19kdGRfZW50cnkpKSB7CisJCURSTV9FUlJPUigiVW5leHBl Y3RlZCBHRFREIHNpemUgJXVcbiIsIGdlbmVyaWNfZHRkLT5nZHRkX3NpemUpOworCQkvKiBEVEQg aGFzIHVua25vd24gZmllbGRzLCBidXQga2VlcCBnb2luZyAqLworCX0KKworCW51bV9kdGQgPSAo Z2V0X2Jsb2Nrc2l6ZShnZW5lcmljX2R0ZCkgLQorCQkgICBzaXplb2Yoc3RydWN0IGJkYl9nZW5l cmljX2R0ZCkpIC8gZ2VuZXJpY19kdGQtPmdkdGRfc2l6ZTsKKwlpZiAoZGV2X3ByaXYtPnZidC5w YW5lbF90eXBlID4gbnVtX2R0ZCkgeworCQlEUk1fRVJST1IoIlBhbmVsIHR5cGUgJWQgbm90IGZv dW5kIGluIHRhYmxlIG9mICVkIERURCdzXG4iLAorCQkJICBkZXZfcHJpdi0+dmJ0LnBhbmVsX3R5 cGUsIG51bV9kdGQpOworCQlyZXR1cm47CisJfQorCisJZHRkID0gJmdlbmVyaWNfZHRkLT5kdGRb ZGV2X3ByaXYtPnZidC5wYW5lbF90eXBlXTsKKworCXBhbmVsX2ZpeGVkX21vZGUgPSBremFsbG9j KHNpemVvZigqcGFuZWxfZml4ZWRfbW9kZSksIEdGUF9LRVJORUwpOworCWlmICghcGFuZWxfZml4 ZWRfbW9kZSkKKwkJcmV0dXJuOworCisJcGFuZWxfZml4ZWRfbW9kZS0+aGRpc3BsYXkgPSBkdGQt PmhhY3RpdmU7CisJcGFuZWxfZml4ZWRfbW9kZS0+aHN5bmNfc3RhcnQgPQorCQlwYW5lbF9maXhl ZF9tb2RlLT5oZGlzcGxheSArIGR0ZC0+aGZyb250X3BvcmNoOworCXBhbmVsX2ZpeGVkX21vZGUt PmhzeW5jX2VuZCA9CisJCXBhbmVsX2ZpeGVkX21vZGUtPmhzeW5jX3N0YXJ0ICsgZHRkLT5oc3lu YzsKKwlwYW5lbF9maXhlZF9tb2RlLT5odG90YWwgPSBwYW5lbF9maXhlZF9tb2RlLT5oc3luY19l bmQ7CisKKwlwYW5lbF9maXhlZF9tb2RlLT52ZGlzcGxheSA9IGR0ZC0+dmFjdGl2ZTsKKwlwYW5l bF9maXhlZF9tb2RlLT52c3luY19zdGFydCA9CisJCXBhbmVsX2ZpeGVkX21vZGUtPnZkaXNwbGF5 ICsgZHRkLT52ZnJvbnRfcG9yY2g7CisJcGFuZWxfZml4ZWRfbW9kZS0+dnN5bmNfZW5kID0KKwkJ cGFuZWxfZml4ZWRfbW9kZS0+dnN5bmNfc3RhcnQgKyBkdGQtPnZzeW5jOworCXBhbmVsX2ZpeGVk X21vZGUtPnZ0b3RhbCA9IHBhbmVsX2ZpeGVkX21vZGUtPnZzeW5jX2VuZDsKKworCXBhbmVsX2Zp eGVkX21vZGUtPmNsb2NrID0gZHRkLT5waXhlbF9jbG9jazsKKwlwYW5lbF9maXhlZF9tb2RlLT53 aWR0aF9tbSA9IGR0ZC0+d2lkdGhfbW07CisJcGFuZWxfZml4ZWRfbW9kZS0+aGVpZ2h0X21tID0g ZHRkLT5oZWlnaHRfbW07CisKKwlwYW5lbF9maXhlZF9tb2RlLT50eXBlID0gRFJNX01PREVfVFlQ RV9QUkVGRVJSRUQ7CisJZHJtX21vZGVfc2V0X25hbWUocGFuZWxfZml4ZWRfbW9kZSk7CisKKwlp ZiAoZHRkLT5oc3luY19wb3NpdGl2ZV9wb2xhcml0eSkKKwkJcGFuZWxfZml4ZWRfbW9kZS0+Zmxh Z3MgfD0gRFJNX01PREVfRkxBR19QSFNZTkM7CisJZWxzZQorCQlwYW5lbF9maXhlZF9tb2RlLT5m bGFncyB8PSBEUk1fTU9ERV9GTEFHX05IU1lOQzsKKworCWlmIChkdGQtPnZzeW5jX3Bvc2l0aXZl X3BvbGFyaXR5KQorCQlwYW5lbF9maXhlZF9tb2RlLT5mbGFncyB8PSBEUk1fTU9ERV9GTEFHX1BW U1lOQzsKKwllbHNlCisJCXBhbmVsX2ZpeGVkX21vZGUtPmZsYWdzIHw9IERSTV9NT0RFX0ZMQUdf TlZTWU5DOworCisJRFJNX0RFQlVHX0tNUygiRm91bmQgcGFuZWwgbW9kZSBpbiBCSU9TIFZCVCBn ZW5lcmljIGR0ZCB0YWJsZTpcbiIpOworCWRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmUocGFu ZWxfZml4ZWRfbW9kZSk7CisKKwlkZXZfcHJpdi0+dmJ0LmxmcF9sdmRzX3ZidF9tb2RlID0gcGFu ZWxfZml4ZWRfbW9kZTsKK30KKworc3RhdGljIHZvaWQKK3BhcnNlX3BhbmVsX2R0ZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCWNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpi ZGIpCit7CisJLyoKKwkgKiBPbGRlciBWQlRzIHByb3ZpZGVkIHByb3ZpZGVkIERURCBpbmZvcm1h dGlvbiBmb3IgaW50ZXJuYWwgZGlzcGxheXMKKwkgKiB0aHJvdWdoIHRoZSAiTEZQIHBhbmVsIERU RCIgYmxvY2sgKDQyKS4gIEFzIG9mIFZCVCByZXZpc2lvbiAyMjksCisJICogdGhhdCBibG9jayBp cyBub3cgZGVwcmVjYXRlZCBhbmQgRFREIGluZm9ybWF0aW9uIHNob3VsZCBiZSBwcm92aWRlZAor CSAqIHZpYSBhIG5ld2VyICJnZW5lcmljIERURCIgYmxvY2sgKDU4KS4gIEp1c3QgdG8gYmUgc2Fm ZSwgd2UnbGwKKwkgKiB0cnkgdGhlIG5ldyBnZW5lcmljIERURCBibG9jayBmaXJzdCBvbiBWQlQg Pj0gMjI5LCBidXQgc3RpbGwgZmFsbAorCSAqIGJhY2sgdG8gdHJ5aW5nIHRoZSBvbGQgTEZQIGJs b2NrIGlmIHRoYXQgZmFpbHMuCisJICovCisJaWYgKGJkYi0+dmVyc2lvbiA+PSAyMjkpCisJCXBh cnNlX2dlbmVyaWNfZHRkKGRldl9wcml2LCBiZGIpOworCWlmICghZGV2X3ByaXYtPnZidC5sZnBf bHZkc192YnRfbW9kZSkKKwkJcGFyc2VfbGZwX3BhbmVsX2R0ZChkZXZfcHJpdiwgYmRiKTsKK30K Kwogc3RhdGljIHZvaWQKIHBhcnNlX2xmcF9iYWNrbGlnaHQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQkgICAgY29uc3Qgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikKQEAgLTE4 NzcsNyArMTk2OSw3IEBAIHZvaWQgaW50ZWxfYmlvc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlwYXJzZV9nZW5lcmFsX2ZlYXR1cmVzKGRldl9wcml2LCBiZGIpOwog CXBhcnNlX2dlbmVyYWxfZGVmaW5pdGlvbnMoZGV2X3ByaXYsIGJkYik7CiAJcGFyc2VfcGFuZWxf b3B0aW9ucyhkZXZfcHJpdiwgYmRiKTsKLQlwYXJzZV9sZnBfcGFuZWxfZHRkKGRldl9wcml2LCBi ZGIpOworCXBhcnNlX3BhbmVsX2R0ZChkZXZfcHJpdiwgYmRiKTsKIAlwYXJzZV9sZnBfYmFja2xp Z2h0KGRldl9wcml2LCBiZGIpOwogCXBhcnNlX3Nkdm9fcGFuZWxfZGF0YShkZXZfcHJpdiwgYmRi KTsKIAlwYXJzZV9kcml2ZXJfZmVhdHVyZXMoZGV2X3ByaXYsIGJkYik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3ZidF9kZWZzLmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3ZidF9kZWZzLmgKaW5kZXggNjlhN2NiMWZhMTIxLi5m MDMzOGRhM2E4MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfdmJ0X2RlZnMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Zi dF9kZWZzLmgKQEAgLTExNSw2ICsxMTUsNyBAQCBlbnVtIGJkYl9ibG9ja19pZCB7CiAJQkRCX01J UElfQ09ORklHCQkJPSA1MiwKIAlCREJfTUlQSV9TRVFVRU5DRQkJPSA1MywKIAlCREJfQ09NUFJF U1NJT05fUEFSQU1FVEVSUwk9IDU2LAorCUJEQl9HRU5FUklDX0RURAkJCT0gNTgsCiAJQkRCX1NL SVAJCQk9IDI1NCwgLyogVkJJT1MgcHJpdmF0ZSBibG9jaywgaWdub3JlICovCiB9OwogCkBAIC04 NjMsNCArODY0LDM0IEBAIHN0cnVjdCBiZGJfY29tcHJlc3Npb25fcGFyYW1ldGVycyB7CiAJc3Ry dWN0IGRzY19jb21wcmVzc2lvbl9wYXJhbWV0ZXJzX2VudHJ5IGRhdGFbMTZdOwogfSBfX3BhY2tl ZDsKIAorLyoKKyAqIEJsb2NrIDU4IC0gR2VuZXJpYyBEVEQgQmxvY2sKKyAqLworCitzdHJ1Y3Qg Z2VuZXJpY19kdGRfZW50cnkgeworCXUzMiBwaXhlbF9jbG9jazsKKwl1MTYgaGFjdGl2ZTsKKwl1 MTYgaGJsYW5rOworCXUxNiBoZnJvbnRfcG9yY2g7CisJdTE2IGhzeW5jOworCXUxNiB2YWN0aXZl OworCXUxNiB2Ymxhbms7CisJdTE2IHZmcm9udF9wb3JjaDsKKwl1MTYgdnN5bmM7CisJdTE2IHdp ZHRoX21tOworCXUxNiBoZWlnaHRfbW07CisKKwkvKiBGbGFncyAqLworCXU4IHJzdmRfZmxhZ3M6 NjsKKwl1OCB2c3luY19wb3NpdGl2ZV9wb2xhcml0eToxOworCXU4IGhzeW5jX3Bvc2l0aXZlX3Bv bGFyaXR5OjE7CisKKwl1OCByc3ZkWzNdOworfSBfX3BhY2tlZDsKKworc3RydWN0IGJkYl9nZW5l cmljX2R0ZCB7CisJdTE2IGdkdGRfc2l6ZTsKKwlzdHJ1Y3QgZ2VuZXJpY19kdGRfZW50cnkgZHRk W107CS8qIHVwIHRvIDI0IERURCdzICovCit9IF9fcGFja2VkOworCiAjZW5kaWYgLyogX0lOVEVM X1ZCVF9ERUZTX0hfICovCi0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeA==