From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 07/18] video/hdmi: Handle the NTSC VBI infoframe Date: Thu, 20 Sep 2018 21:51:34 +0300 Message-ID: <20180920185145.1912-8-ville.syrjala@linux.intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180920185145.1912-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFk ZCB0aGUgY29kZSB0byBkZWFsIHdpdGggdGhlIE5UU0MgVkJJIGluZm9mcmFtZS4KCkkgZGVjaWRl ZCBhZ2FpbnN0IHBhcnNpbmcgdGhlIFBFU19kYXRhX2ZpZWxkIGFuZCBqdXN0IGxlYXZlCml0IGFz IGFuIG9wYXF1ZSBibG9iLCBqdXN0IGR1bXBpbmcgaXQgb3V0IGFzIGhleCBpbiB0aGUgbG9nLgoK QmxpbmRseSB0eXBlZCBmcm9tIHRoZSBzcGVjLCBhbmQgdG90YWxseSB1bnRlc3RlZC4KCkNjOiBU aGllcnJ5IFJlZGluZyA8dGhpZXJyeS5yZWRpbmdAZ21haWwuY29tPgpDYzogSGFucyBWZXJrdWls IDxoYW5zLnZlcmt1aWxAY2lzY28uY29tPgpDYzogbGludXgtbWVkaWFAdmdlci5rZXJuZWwub3Jn ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy92aWRlby9oZG1pLmMgfCAyMDggKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBpbmNsdWRlL2xpbnV4L2hkbWkuaCB8 ICAxOCArKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAyMjYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvdmlkZW8vaGRtaS5jIGIvZHJpdmVycy92aWRlby9oZG1pLmMKaW5kZXggM2Qy NGM3NzQ2YzUxLi4zYzMyMGQ2OWZhMGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vaGRtaS5j CisrKyBiL2RyaXZlcnMvdmlkZW8vaGRtaS5jCkBAIC04MzEsNiArODMxLDEzOSBAQCBzc2l6ZV90 IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2soc3RydWN0IGhkbWlfbXBlZ19zb3VyY2Vf aW5mb2ZyYW1lICpmcmFtZQogfQogRVhQT1JUX1NZTUJPTChoZG1pX21wZWdfc291cmNlX2luZm9m cmFtZV9wYWNrKTsKIAorLyoqCisgKiBoZG1pX250c2NfdmJpX2luZm9mcmFtZV9pbml0KCkgLSBp bml0aWFsaXplIGFuIEhETUkgTlRTQyBWQkkgaW5mb2ZyYW1lCisgKiBAZnJhbWU6IEhETUkgTlRT QyBWQkkgaW5mb2ZyYW1lCisgKiBAcGVzX2RhdGFfZmllbGQ6IEFOU0kvU0NURSAxMjcgUEVTX2Rh dGFfZmllbGQKKyAqIEBsZW5ndGg6IEFOU0kvU0NURSAxMjcgUEVTX2RhdGFfZmllbGQgbGVuZ3Ro CisgKgorICogUmV0dXJucyAwIG9uIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9u IGZhaWx1cmUuCisgKi8KK2ludCBoZG1pX250c2NfdmJpX2luZm9mcmFtZV9pbml0KHN0cnVjdCBo ZG1pX250c2NfdmJpX2luZm9mcmFtZSAqZnJhbWUsCisJCQkJIGNvbnN0IHZvaWQgKnBlc19kYXRh X2ZpZWxkLAorCQkJCSBzaXplX3QgbGVuZ3RoKQoreworCWlmIChsZW5ndGggPCAxIHx8IGxlbmd0 aCA+IDI3KQorCQlyZXR1cm4gLUVJTlZBTDsKKworCW1lbXNldChmcmFtZSwgMCwgc2l6ZW9mKCpm cmFtZSkpOworCisJZnJhbWUtPnR5cGUgPSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJOwor CWZyYW1lLT52ZXJzaW9uID0gMTsKKwlmcmFtZS0+bGVuZ3RoID0gbGVuZ3RoOworCisJbWVtY3B5 KGZyYW1lLT5wZXNfZGF0YV9maWVsZCwgcGVzX2RhdGFfZmllbGQsIGxlbmd0aCk7CisKKwlyZXR1 cm4gMDsKK30KK0VYUE9SVF9TWU1CT0woaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfaW5pdCk7CisK K3N0YXRpYyBpbnQgaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfY2hlY2tfb25seShjb25zdCBzdHJ1 Y3QgaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWUgKmZyYW1lKQoreworCWlmIChmcmFtZS0+dHlwZSAh PSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJIHx8CisJICAgIGZyYW1lLT52ZXJzaW9uICE9 IDEgfHwKKwkgICAgZnJhbWUtPmxlbmd0aCA8IDEgfHwgZnJhbWUtPmxlbmd0aCA+IDI3KQorCQly ZXR1cm4gLUVJTlZBTDsKKworCWlmIChmcmFtZS0+cGVzX2RhdGFfZmllbGRbMF0gIT0gMHg5OSkK KwkJcmV0dXJuIC1FSU5WQUw7CisKKwlyZXR1cm4gMDsKK30KKworLyoqCisgKiBoZG1pX250c2Nf dmJpX2luZm9mcmFtZV9jaGVjaygpIC0gQ2hlY2sgYW5kIGNoZWNrIGEgSERNSSBOVFNDIFZCSSBp bmZvZnJhbWUKKyAqIEBmcmFtZTogSERNSSBOVFNDIFZCSSBpbmZvZnJhbWUKKyAqCisgKiBWYWxp ZGF0ZXMgdGhhdCB0aGUgaW5mb2ZyYW1lIGlzIGNvbnNpc3RlbnQgYW5kIHVwZGF0ZXMgZGVyaXZl ZCBmaWVsZHMKKyAqIChlZy4gbGVuZ3RoKSBiYXNlZCBvbiBvdGhlciBmaWVsZHMuCisgKgorICog UmV0dXJucyAwIG9uIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUu CisgKi8KK2ludCBoZG1pX250c2NfdmJpX2luZm9mcmFtZV9jaGVjayhzdHJ1Y3QgaGRtaV9udHNj X3ZiaV9pbmZvZnJhbWUgKmZyYW1lKQoreworCXJldHVybiBoZG1pX250c2NfdmJpX2luZm9mcmFt ZV9jaGVja19vbmx5KGZyYW1lKTsKK30KK0VYUE9SVF9TWU1CT0woaGRtaV9udHNjX3ZiaV9pbmZv ZnJhbWVfY2hlY2spOworCisvKioKKyAqIGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX3BhY2tfb25s eSgpIC0gd3JpdGUgSERNSSBOVFNDIFZCSSBpbmZvZnJhbWUgdG8gYmluYXJ5IGJ1ZmZlcgorICog QGZyYW1lOiBIRE1JIE5UU0MgVkJJIGluZm9mcmFtZQorICogQGJ1ZmZlcjogZGVzdGluYXRpb24g YnVmZmVyCisgKiBAc2l6ZTogc2l6ZSBvZiBidWZmZXIKKyAqCisgKiBQYWNrcyB0aGUgaW5mb3Jt YXRpb24gY29udGFpbmVkIGluIHRoZSBAZnJhbWUgc3RydWN0dXJlIGludG8gYSBiaW5hcnkKKyAq IHJlcHJlc2VudGF0aW9uIHRoYXQgY2FuIGJlIHdyaXR0ZW4gaW50byB0aGUgY29ycmVzcG9uZGlu ZyBjb250cm9sbGVyCisgKiByZWdpc3RlcnMuIEFsc28gY29tcHV0ZXMgdGhlIGNoZWNrc3VtIGFz IHJlcXVpcmVkIGJ5IHNlY3Rpb24gNS4zLjUgb2YKKyAqIHRoZSBIRE1JIDEuNCBzcGVjaWZpY2F0 aW9uLgorICoKKyAqIFJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyBwYWNrZWQgaW50byB0aGUg YmluYXJ5IGJ1ZmZlciBvciBhIG5lZ2F0aXZlCisgKiBlcnJvciBjb2RlIG9uIGZhaWx1cmUuCisg Ki8KK3NzaXplX3QgaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfcGFja19vbmx5KGNvbnN0IHN0cnVj dCBoZG1pX250c2NfdmJpX2luZm9mcmFtZSAqZnJhbWUsCisJCQkJCSAgdm9pZCAqYnVmZmVyLCBz aXplX3Qgc2l6ZSkKK3sKKwl1OCAqcHRyID0gYnVmZmVyOworCXNpemVfdCBsZW5ndGg7CisJaW50 IHJldDsKKworCXJldCA9IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX2NoZWNrX29ubHkoZnJhbWUp OworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlsZW5ndGggPSBIRE1JX0lORk9GUkFNRV9I RUFERVJfU0laRSArIGZyYW1lLT5sZW5ndGg7CisKKwlpZiAoc2l6ZSA8IGxlbmd0aCkKKwkJcmV0 dXJuIC1FTk9TUEM7CisKKwltZW1zZXQoYnVmZmVyLCAwLCBzaXplKTsKKworCXB0clswXSA9IGZy YW1lLT50eXBlOworCXB0clsxXSA9IGZyYW1lLT52ZXJzaW9uOworCXB0clsyXSA9IGZyYW1lLT5s ZW5ndGg7CisJcHRyWzNdID0gMDsgLyogY2hlY2tzdW0gKi8KKworCS8qIHN0YXJ0IGluZm9mcmFt ZSBwYXlsb2FkICovCisJcHRyICs9IEhETUlfSU5GT0ZSQU1FX0hFQURFUl9TSVpFOworCisJbWVt Y3B5KHB0ciwgZnJhbWUtPnBlc19kYXRhX2ZpZWxkLCBmcmFtZS0+bGVuZ3RoKTsKKworCWhkbWlf aW5mb2ZyYW1lX3NldF9jaGVja3N1bShidWZmZXIsIGxlbmd0aCk7CisKKwlyZXR1cm4gbGVuZ3Ro OworfQorRVhQT1JUX1NZTUJPTChoZG1pX250c2NfdmJpX2luZm9mcmFtZV9wYWNrX29ubHkpOwor CisvKioKKyAqIGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX3BhY2soKSAtIENoZWNrIGFuZCBjaGVj ayBhIEhETUkgTlRTQyBWQkkgaW5mb2ZyYW1lLAorICogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYW5kIHdyaXRlIGl0IHRvIGJpbmFyeSBidWZmZXIKKyAqIEBmcmFtZTogSERNSSBO VFNDIFZCSSBpbmZvZnJhbWUKKyAqIEBidWZmZXI6IGRlc3RpbmF0aW9uIGJ1ZmZlcgorICogQHNp emU6IHNpemUgb2YgYnVmZmVyCisgKgorICogVmFsaWRhdGVzIHRoYXQgdGhlIGluZm9mcmFtZSBp cyBjb25zaXN0ZW50IGFuZCB1cGRhdGVzIGRlcml2ZWQgZmllbGRzCisgKiAoZWcuIGxlbmd0aCkg YmFzZWQgb24gb3RoZXIgZmllbGRzLCBhZnRlciB3aGljaCBwYWNrcyB0aGUgaW5mb3JtYXRpb24K KyAqIGNvbnRhaW5lZCBpbiB0aGUgQGZyYW1lIHN0cnVjdHVyZSBpbnRvIGEgYmluYXJ5IHJlcHJl c2VudGF0aW9uIHRoYXQKKyAqIGNhbiBiZSB3cml0dGVuIGludG8gdGhlIGNvcnJlc3BvbmRpbmcg Y29udHJvbGxlciByZWdpc3RlcnMuIEFsc28KKyAqIGNvbXB1dGVzIHRoZSBjaGVja3N1bSBhcyBy ZXF1aXJlZCBieSBzZWN0aW9uIDUuMy41IG9mIHRoZSBIRE1JIDEuNAorICogc3BlY2lmaWNhdGlv bi4KKyAqCisgKiBSZXR1cm5zIHRoZSBudW1iZXIgb2YgYnl0ZXMgcGFja2VkIGludG8gdGhlIGJp bmFyeSBidWZmZXIgb3IgYSBuZWdhdGl2ZQorICogZXJyb3IgY29kZSBvbiBmYWlsdXJlLgorICov Citzc2l6ZV90IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX3BhY2soc3RydWN0IGhkbWlfbnRzY192 YmlfaW5mb2ZyYW1lICpmcmFtZSwKKwkJCQkgICAgIHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUp Cit7CisJaW50IHJldDsKKworCXJldCA9IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX2NoZWNrKGZy YW1lKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0dXJuIGhkbWlfbnRzY192Ymlf aW5mb2ZyYW1lX3BhY2tfb25seShmcmFtZSwgYnVmZmVyLCBzaXplKTsKK30KK0VYUE9SVF9TWU1C T0woaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfcGFjayk7CisKIC8qKgogICogaGRtaV9pbmZvZnJh bWVfY2hlY2soKSAtIENoZWNrIGNoZWNrIGEgSERNSSBpbmZvZnJhbWUKICAqIEBmcmFtZTogSERN SSBpbmZvZnJhbWUKQEAgLTg1NCw2ICs5ODcsOCBAQCBoZG1pX2luZm9mcmFtZV9jaGVjayh1bmlv biBoZG1pX2luZm9mcmFtZSAqZnJhbWUpCiAJCXJldHVybiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2Zy YW1lX2NoZWNrKCZmcmFtZS0+dmVuZG9yKTsKIAljYXNlIEhETUlfSU5GT0ZSQU1FX1RZUEVfTVBF R19TT1VSQ0U6CiAJCXJldHVybiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVjaygmZnJh bWUtPm1wZWdfc291cmNlKTsKKwljYXNlIEhETUlfSU5GT0ZSQU1FX1RZUEVfTlRTQ19WQkk6CisJ CXJldHVybiBoZG1pX250c2NfdmJpX2luZm9mcmFtZV9jaGVjaygmZnJhbWUtPm50c2NfdmJpKTsK IAlkZWZhdWx0OgogCQlXQVJOKDEsICJCYWQgaW5mb2ZyYW1lIHR5cGUgJWRcbiIsIGZyYW1lLT5h bnkudHlwZSk7CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtOTAxLDYgKzEwMzYsMTAgQEAgaGRtaV9p bmZvZnJhbWVfcGFja19vbmx5KGNvbnN0IHVuaW9uIGhkbWlfaW5mb2ZyYW1lICpmcmFtZSwgdm9p ZCAqYnVmZmVyLCBzaXplX3QKIAkJbGVuZ3RoID0gaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVf cGFja19vbmx5KCZmcmFtZS0+bXBlZ19zb3VyY2UsCiAJCQkJCQkJICAgICAgYnVmZmVyLCBzaXpl KTsKIAkJYnJlYWs7CisJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJOgorCQlsZW5n dGggPSBoZG1pX250c2NfdmJpX2luZm9mcmFtZV9wYWNrX29ubHkoJmZyYW1lLT5udHNjX3ZiaSwK KwkJCQkJCQkgICBidWZmZXIsIHNpemUpOworCQlicmVhazsKIAlkZWZhdWx0OgogCQlXQVJOKDEs ICJCYWQgaW5mb2ZyYW1lIHR5cGUgJWRcbiIsIGZyYW1lLT5hbnkudHlwZSk7CiAJCWxlbmd0aCA9 IC1FSU5WQUw7CkBAIC05NTEsNiArMTA5MCwxMCBAQCBoZG1pX2luZm9mcmFtZV9wYWNrKHVuaW9u IGhkbWlfaW5mb2ZyYW1lICpmcmFtZSwKIAkJbGVuZ3RoID0gaGRtaV9tcGVnX3NvdXJjZV9pbmZv ZnJhbWVfcGFjaygmZnJhbWUtPm1wZWdfc291cmNlLAogCQkJCQkJCSBidWZmZXIsIHNpemUpOwog CQlicmVhazsKKwljYXNlIEhETUlfSU5GT0ZSQU1FX1RZUEVfTlRTQ19WQkk6CisJCWxlbmd0aCA9 IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lX3BhY2soJmZyYW1lLT5udHNjX3ZiaSwKKwkJCQkJCSAg ICAgIGJ1ZmZlciwgc2l6ZSk7CisJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCVdBUk4oMSwgIkJhZCBp bmZvZnJhbWUgdHlwZSAlZFxuIiwgZnJhbWUtPmFueS50eXBlKTsKIAkJbGVuZ3RoID0gLUVJTlZB TDsKQEAgLTk3NSw2ICsxMTE4LDggQEAgc3RhdGljIGNvbnN0IGNoYXIgKmhkbWlfaW5mb2ZyYW1l X3R5cGVfZ2V0X25hbWUoZW51bSBoZG1pX2luZm9mcmFtZV90eXBlIHR5cGUpCiAJCXJldHVybiAi QXVkaW8iOwogCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQRV9NUEVHX1NPVVJDRToKIAkJcmV0dXJu ICJNUEVHIFNvdXJjZSI7CisJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJOgorCQly ZXR1cm4gIk5UU0MgVkJJIjsKIAl9CiAJcmV0dXJuICJSZXNlcnZlZCI7CiB9CkBAIC0xNTI2LDYg KzE2NzEsMjIgQEAgc3RhdGljIHZvaWQgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfbG9nKGNv bnN0IGNoYXIgKmxldmVsLAogCQkgZnJhbWUtPmZpZWxkX3JlcGVhdCA/ICJZZXMiIDogIk5vIik7 CiB9CiAKKy8qKgorICogaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfbG9nKCkgLSBsb2cgaW5mbyBv ZiBIRE1JIE5UU0MgVkJJIGluZm9mcmFtZQorICogQGxldmVsOiBsb2dnaW5nIGxldmVsCisgKiBA ZGV2OiBkZXZpY2UKKyAqIEBmcmFtZTogSERNSSBOVFNDIFZCSSBpbmZvZnJhbWUKKyAqLworc3Rh dGljIHZvaWQgaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWVfbG9nKGNvbnN0IGNoYXIgKmxldmVsLAor CQkJCQlzdHJ1Y3QgZGV2aWNlICpkZXYsCisJCQkJCWNvbnN0IHN0cnVjdCBoZG1pX250c2NfdmJp X2luZm9mcmFtZSAqZnJhbWUpCit7CisJaGRtaV9pbmZvZnJhbWVfbG9nX2hlYWRlcihsZXZlbCwg ZGV2LAorCQkJCSAgKGNvbnN0IHN0cnVjdCBoZG1pX2FueV9pbmZvZnJhbWUgKilmcmFtZSk7CisK KwloZG1pX2xvZygiICAgICUqcGhcbiIsIGZyYW1lLT5sZW5ndGgsIGZyYW1lLT5wZXNfZGF0YV9m aWVsZCk7Cit9CisKIC8qKgogICogaGRtaV9pbmZvZnJhbWVfbG9nKCkgLSBsb2cgaW5mbyBvZiBI RE1JIGluZm9mcmFtZQogICogQGxldmVsOiBsb2dnaW5nIGxldmVsCkBAIC0xNTUyLDYgKzE3MTMs OSBAQCB2b2lkIGhkbWlfaW5mb2ZyYW1lX2xvZyhjb25zdCBjaGFyICpsZXZlbCwKIAljYXNlIEhE TUlfSU5GT0ZSQU1FX1RZUEVfTVBFR19TT1VSQ0U6CiAJCWhkbWlfbXBlZ19zb3VyY2VfaW5mb2Zy YW1lX2xvZyhsZXZlbCwgZGV2LCAmZnJhbWUtPm1wZWdfc291cmNlKTsKIAkJYnJlYWs7CisJY2Fz ZSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJOgorCQloZG1pX250c2NfdmJpX2luZm9mcmFt ZV9sb2cobGV2ZWwsIGRldiwgJmZyYW1lLT5udHNjX3ZiaSk7CisJCWJyZWFrOwogCX0KIH0KIEVY UE9SVF9TWU1CT0woaGRtaV9pbmZvZnJhbWVfbG9nKTsKQEAgLTE4NDAsNiArMjAwNCw0NyBAQCBz dGF0aWMgaW50IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3VucGFjayhzdHJ1Y3QgaGRtaV9t cGVnX3NvdXJjZV9pbmZvZnJhbWUgKgogCXJldHVybiAwOwogfQogCisvKioKKyAqIGhkbWlfbnRz Y192YmlfaW5mb2ZyYW1lX3VucGFjaygpIC0gdW5wYWNrIGJpbmFyeSBidWZmZXIgdG8gYSBIRE1J IE1QRUcgU291cmNlIGluZm9mcmFtZQorICogQGZyYW1lOiBIRE1JIE1QRUcgU291cmNlIGluZm9m cmFtZQorICogQGJ1ZmZlcjogc291cmNlIGJ1ZmZlcgorICogQHNpemU6IHNpemUgb2YgYnVmZmVy CisgKgorICogVW5wYWNrcyB0aGUgaW5mb3JtYXRpb24gY29udGFpbmVkIGluIGJpbmFyeSBAYnVm ZmVyIGludG8gYSBzdHJ1Y3R1cmVkCisgKiBAZnJhbWUgb2YgdGhlIEhETUkgTVBFRyBTb3VyY2Ug aW5mb3JtYXRpb24gZnJhbWUuCisgKiBBbHNvIHZlcmlmaWVzIHRoZSBjaGVja3N1bSBhcyByZXF1 aXJlZCBieSBzZWN0aW9uIDUuMy41IG9mIHRoZSBIRE1JIDEuNAorICogc3BlY2lmaWNhdGlvbi4K KyAqCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0aXZlIGVycm9yIGNvZGUgb24g ZmFpbHVyZS4KKyAqLworc3RhdGljIGludCBoZG1pX250c2NfdmJpX2luZm9mcmFtZV91bnBhY2so c3RydWN0IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1lICpmcmFtZSwKKwkJCQkJICBjb25zdCB2b2lk ICpidWZmZXIsIHNpemVfdCBzaXplKQoreworCWNvbnN0IHU4ICpwdHIgPSBidWZmZXI7CisJc2l6 ZV90IGxlbmd0aDsKKworCWlmIChzaXplIDwgSERNSV9JTkZPRlJBTUVfSEVBREVSX1NJWkUpCisJ CXJldHVybiAtRUlOVkFMOworCisJaWYgKHB0clswXSAhPSBIRE1JX0lORk9GUkFNRV9UWVBFX05U U0NfVkJJIHx8CisJICAgIHB0clsxXSAhPSAxIHx8CisJICAgIHB0clsyXSA8IDEgfHwgcHRyWzJd ID4gMjcpCisJCXJldHVybiAtRUlOVkFMOworCisJbGVuZ3RoID0gcHRyWzJdOworCisJaWYgKHNp emUgPCBIRE1JX0lORk9GUkFNRV9IRUFERVJfU0laRSArIGxlbmd0aCkKKwkJcmV0dXJuIC1FSU5W QUw7CisKKwlpZiAoaGRtaV9pbmZvZnJhbWVfY2hlY2tzdW0oYnVmZmVyLAorCQkJCSAgICBIRE1J X0lORk9GUkFNRV9IRUFERVJfU0laRSArIGxlbmd0aCkgIT0gMCkKKwkJcmV0dXJuIC1FSU5WQUw7 CisKKwlwdHIgKz0gSERNSV9JTkZPRlJBTUVfSEVBREVSX1NJWkU7CisKKwlyZXR1cm4gaGRtaV9u dHNjX3ZiaV9pbmZvZnJhbWVfaW5pdChmcmFtZSwgcHRyLCBsZW5ndGgpOworfQorCiAvKioKICAq IGhkbWlfaW5mb2ZyYW1lX3VucGFjaygpIC0gdW5wYWNrIGJpbmFyeSBidWZmZXIgdG8gYSBIRE1J IGluZm9mcmFtZQogICogQGZyYW1lOiBIRE1JIGluZm9mcmFtZQpAQCAtMTg3OCw2ICsyMDgzLDkg QEAgaW50IGhkbWlfaW5mb2ZyYW1lX3VucGFjayh1bmlvbiBoZG1pX2luZm9mcmFtZSAqZnJhbWUs CiAJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09VUkNFOgogCQlyZXQgPSBoZG1pX21w ZWdfc291cmNlX2luZm9mcmFtZV91bnBhY2soJmZyYW1lLT5tcGVnX3NvdXJjZSwgYnVmZmVyLCBz aXplKTsKIAkJYnJlYWs7CisJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJOgorCQly ZXQgPSBoZG1pX250c2NfdmJpX2luZm9mcmFtZV91bnBhY2soJmZyYW1lLT5udHNjX3ZiaSwgYnVm ZmVyLCBzaXplKTsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJcmV0ID0gLUVJTlZBTDsKIAkJYnJl YWs7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2hkbWkuaCBiL2luY2x1ZGUvbGludXgvaGRt aS5oCmluZGV4IDJjOTMyMmY3NTM4ZC4uMzgyMTUxNmIzMzZjIDEwMDY0NAotLS0gYS9pbmNsdWRl L2xpbnV4L2hkbWkuaAorKysgYi9pbmNsdWRlL2xpbnV4L2hkbWkuaApAQCAtNDgsNiArNDgsNyBA QCBlbnVtIGhkbWlfaW5mb2ZyYW1lX3R5cGUgewogCUhETUlfSU5GT0ZSQU1FX1RZUEVfU1BEID0g MHg4MywKIAlIRE1JX0lORk9GUkFNRV9UWVBFX0FVRElPID0gMHg4NCwKIAlIRE1JX0lORk9GUkFN RV9UWVBFX01QRUdfU09VUkNFID0gMHg4NSwKKwlIRE1JX0lORk9GUkFNRV9UWVBFX05UU0NfVkJJ ID0gMHg4NiwKIH07CiAKICNkZWZpbmUgSERNSV9JRUVFX09VSSAweDAwMGMwMwpAQCAtMzYyLDYg KzM2MywyMSBAQCBzc2l6ZV90IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2tfb25seShj b25zdCBzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZgogCQkJCQkgICAgIHZvaWQgKmJ1ZmZl ciwgc2l6ZV90IHNpemUpOwogaW50IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNrKHN0 cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAqZnJhbWUpOwogCitzdHJ1Y3QgaGRtaV9u dHNjX3ZiaV9pbmZvZnJhbWUgeworCWVudW0gaGRtaV9pbmZvZnJhbWVfdHlwZSB0eXBlOworCXVu c2lnbmVkIGNoYXIgdmVyc2lvbjsKKwl1bnNpZ25lZCBjaGFyIGxlbmd0aDsKKwl1bnNpZ25lZCBj aGFyIHBlc19kYXRhX2ZpZWxkWzI3XTsKK307CisKK2ludCBoZG1pX250c2NfdmJpX2luZm9mcmFt ZV9pbml0KHN0cnVjdCBoZG1pX250c2NfdmJpX2luZm9mcmFtZSAqZnJhbWUsCisJCQkJIGNvbnN0 IHZvaWQgKnBlc19kYXRhX2ZpZWxkLCBzaXplX3QgbGVuZ3RoKTsKK3NzaXplX3QgaGRtaV9udHNj X3ZiaV9pbmZvZnJhbWVfcGFjayhzdHJ1Y3QgaGRtaV9udHNjX3ZiaV9pbmZvZnJhbWUgKmZyYW1l LAorCQkJCSAgICAgdm9pZCAqYnVmZmVyLCBzaXplX3Qgc2l6ZSk7Citzc2l6ZV90IGhkbWlfbnRz Y192YmlfaW5mb2ZyYW1lX3BhY2tfb25seShjb25zdCBzdHJ1Y3QgaGRtaV9udHNjX3ZiaV9pbmZv ZnJhbWUgKmZyYW1lLAorCQkJCQkgIHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpOworaW50IGhk bWlfbnRzY192YmlfaW5mb2ZyYW1lX2NoZWNrKHN0cnVjdCBoZG1pX250c2NfdmJpX2luZm9mcmFt ZSAqZnJhbWUpOworCiAvKioKICAqIHVuaW9uIGhkbWlfaW5mb2ZyYW1lIC0gb3ZlcmFsbCB1bmlv biBvZiBhbGwgYWJzdHJhY3QgaW5mb2ZyYW1lIHJlcHJlc2VudGF0aW9ucwogICogQGFueTogZ2Vu ZXJpYyBpbmZvZnJhbWUKQEAgLTM3MCw2ICszODYsNyBAQCBpbnQgaGRtaV9tcGVnX3NvdXJjZV9p bmZvZnJhbWVfY2hlY2soc3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSk7 CiAgKiBAdmVuZG9yOiB1bmlvbiBvZiBhbGwgdmVuZG9yIGluZm9mcmFtZXMKICAqIEBhdWRpbzog YXVkaW8gaW5mb2ZyYW1lCiAgKiBAbXBlZ19zb3VyY2U6IG1wZWcgc291cmNlIGluZm9mcmFtZQor ICogQG50c2NfdmJpOiBudHNjIHZiaSBpbmZvZnJhbWUKICAqCiAgKiBUaGlzIGlzIHVzZWQgYnkg dGhlIGdlbmVyaWMgcGFjayBmdW5jdGlvbi4gVGhpcyB3b3JrcyBzaW5jZSBhbGwgaW5mb2ZyYW1l cwogICogaGF2ZSB0aGUgc2FtZSBoZWFkZXIgd2hpY2ggYWxzbyBpbmRpY2F0ZXMgd2hpY2ggdHlw ZSBvZiBpbmZvZnJhbWUgc2hvdWxkIGJlCkBAIC0zODIsNiArMzk5LDcgQEAgdW5pb24gaGRtaV9p bmZvZnJhbWUgewogCXVuaW9uIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWUgdmVuZG9yOwogCXN0 cnVjdCBoZG1pX2F1ZGlvX2luZm9mcmFtZSBhdWRpbzsKIAlzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJj ZV9pbmZvZnJhbWUgbXBlZ19zb3VyY2U7CisJc3RydWN0IGhkbWlfbnRzY192YmlfaW5mb2ZyYW1l IG50c2NfdmJpOwogfTsKIAogc3NpemVfdCBoZG1pX2luZm9mcmFtZV9wYWNrKHVuaW9uIGhkbWlf aW5mb2ZyYW1lICpmcmFtZSwgdm9pZCAqYnVmZmVyLAotLSAKMi4xNi40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga03.intel.com ([134.134.136.65]:25854 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727171AbeIUAhG (ORCPT ); Thu, 20 Sep 2018 20:37:06 -0400 From: Ville Syrjala To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , linux-media@vger.kernel.org Subject: [PATCH 07/18] video/hdmi: Handle the NTSC VBI infoframe Date: Thu, 20 Sep 2018 21:51:34 +0300 Message-Id: <20180920185145.1912-8-ville.syrjala@linux.intel.com> In-Reply-To: <20180920185145.1912-1-ville.syrjala@linux.intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Ville Syrjälä Add the code to deal with the NTSC VBI infoframe. I decided against parsing the PES_data_field and just leave it as an opaque blob, just dumping it out as hex in the log. Blindly typed from the spec, and totally untested. Cc: Thierry Reding Cc: Hans Verkuil Cc: linux-media@vger.kernel.org Signed-off-by: Ville Syrjälä --- drivers/video/hdmi.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/hdmi.h | 18 +++++ 2 files changed, 226 insertions(+) diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 3d24c7746c51..3c320d69fa0a 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -831,6 +831,139 @@ ssize_t hdmi_mpeg_source_infoframe_pack(struct hdmi_mpeg_source_infoframe *frame } EXPORT_SYMBOL(hdmi_mpeg_source_infoframe_pack); +/** + * hdmi_ntsc_vbi_infoframe_init() - initialize an HDMI NTSC VBI infoframe + * @frame: HDMI NTSC VBI infoframe + * @pes_data_field: ANSI/SCTE 127 PES_data_field + * @length: ANSI/SCTE 127 PES_data_field length + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_ntsc_vbi_infoframe_init(struct hdmi_ntsc_vbi_infoframe *frame, + const void *pes_data_field, + size_t length) +{ + if (length < 1 || length > 27) + return -EINVAL; + + memset(frame, 0, sizeof(*frame)); + + frame->type = HDMI_INFOFRAME_TYPE_NTSC_VBI; + frame->version = 1; + frame->length = length; + + memcpy(frame->pes_data_field, pes_data_field, length); + + return 0; +} +EXPORT_SYMBOL(hdmi_ntsc_vbi_infoframe_init); + +static int hdmi_ntsc_vbi_infoframe_check_only(const struct hdmi_ntsc_vbi_infoframe *frame) +{ + if (frame->type != HDMI_INFOFRAME_TYPE_NTSC_VBI || + frame->version != 1 || + frame->length < 1 || frame->length > 27) + return -EINVAL; + + if (frame->pes_data_field[0] != 0x99) + return -EINVAL; + + return 0; +} + +/** + * hdmi_ntsc_vbi_infoframe_check() - Check and check a HDMI NTSC VBI infoframe + * @frame: HDMI NTSC VBI infoframe + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields. + * + * Returns 0 on success or a negative error code on failure. + */ +int hdmi_ntsc_vbi_infoframe_check(struct hdmi_ntsc_vbi_infoframe *frame) +{ + return hdmi_ntsc_vbi_infoframe_check_only(frame); +} +EXPORT_SYMBOL(hdmi_ntsc_vbi_infoframe_check); + +/** + * hdmi_ntsc_vbi_infoframe_pack_only() - write HDMI NTSC VBI infoframe to binary buffer + * @frame: HDMI NTSC VBI infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Packs the information contained in the @frame structure into a binary + * representation that can be written into the corresponding controller + * registers. Also computes the checksum as required by section 5.3.5 of + * the HDMI 1.4 specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_ntsc_vbi_infoframe_pack_only(const struct hdmi_ntsc_vbi_infoframe *frame, + void *buffer, size_t size) +{ + u8 *ptr = buffer; + size_t length; + int ret; + + ret = hdmi_ntsc_vbi_infoframe_check_only(frame); + if (ret) + return ret; + + length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; + + if (size < length) + return -ENOSPC; + + memset(buffer, 0, size); + + ptr[0] = frame->type; + ptr[1] = frame->version; + ptr[2] = frame->length; + ptr[3] = 0; /* checksum */ + + /* start infoframe payload */ + ptr += HDMI_INFOFRAME_HEADER_SIZE; + + memcpy(ptr, frame->pes_data_field, frame->length); + + hdmi_infoframe_set_checksum(buffer, length); + + return length; +} +EXPORT_SYMBOL(hdmi_ntsc_vbi_infoframe_pack_only); + +/** + * hdmi_ntsc_vbi_infoframe_pack() - Check and check a HDMI NTSC VBI infoframe, + * and write it to binary buffer + * @frame: HDMI NTSC VBI infoframe + * @buffer: destination buffer + * @size: size of buffer + * + * Validates that the infoframe is consistent and updates derived fields + * (eg. length) based on other fields, after which packs the information + * contained in the @frame structure into a binary representation that + * can be written into the corresponding controller registers. Also + * computes the checksum as required by section 5.3.5 of the HDMI 1.4 + * specification. + * + * Returns the number of bytes packed into the binary buffer or a negative + * error code on failure. + */ +ssize_t hdmi_ntsc_vbi_infoframe_pack(struct hdmi_ntsc_vbi_infoframe *frame, + void *buffer, size_t size) +{ + int ret; + + ret = hdmi_ntsc_vbi_infoframe_check(frame); + if (ret) + return ret; + + return hdmi_ntsc_vbi_infoframe_pack_only(frame, buffer, size); +} +EXPORT_SYMBOL(hdmi_ntsc_vbi_infoframe_pack); + /** * hdmi_infoframe_check() - Check check a HDMI infoframe * @frame: HDMI infoframe @@ -854,6 +987,8 @@ hdmi_infoframe_check(union hdmi_infoframe *frame) return hdmi_vendor_any_infoframe_check(&frame->vendor); case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: return hdmi_mpeg_source_infoframe_check(&frame->mpeg_source); + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + return hdmi_ntsc_vbi_infoframe_check(&frame->ntsc_vbi); default: WARN(1, "Bad infoframe type %d\n", frame->any.type); return -EINVAL; @@ -901,6 +1036,10 @@ hdmi_infoframe_pack_only(const union hdmi_infoframe *frame, void *buffer, size_t length = hdmi_mpeg_source_infoframe_pack_only(&frame->mpeg_source, buffer, size); break; + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + length = hdmi_ntsc_vbi_infoframe_pack_only(&frame->ntsc_vbi, + buffer, size); + break; default: WARN(1, "Bad infoframe type %d\n", frame->any.type); length = -EINVAL; @@ -951,6 +1090,10 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, length = hdmi_mpeg_source_infoframe_pack(&frame->mpeg_source, buffer, size); break; + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + length = hdmi_ntsc_vbi_infoframe_pack(&frame->ntsc_vbi, + buffer, size); + break; default: WARN(1, "Bad infoframe type %d\n", frame->any.type); length = -EINVAL; @@ -975,6 +1118,8 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type) return "Audio"; case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: return "MPEG Source"; + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + return "NTSC VBI"; } return "Reserved"; } @@ -1526,6 +1671,22 @@ static void hdmi_mpeg_source_infoframe_log(const char *level, frame->field_repeat ? "Yes" : "No"); } +/** + * hdmi_ntsc_vbi_infoframe_log() - log info of HDMI NTSC VBI infoframe + * @level: logging level + * @dev: device + * @frame: HDMI NTSC VBI infoframe + */ +static void hdmi_ntsc_vbi_infoframe_log(const char *level, + struct device *dev, + const struct hdmi_ntsc_vbi_infoframe *frame) +{ + hdmi_infoframe_log_header(level, dev, + (const struct hdmi_any_infoframe *)frame); + + hdmi_log(" %*ph\n", frame->length, frame->pes_data_field); +} + /** * hdmi_infoframe_log() - log info of HDMI infoframe * @level: logging level @@ -1552,6 +1713,9 @@ void hdmi_infoframe_log(const char *level, case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: hdmi_mpeg_source_infoframe_log(level, dev, &frame->mpeg_source); break; + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + hdmi_ntsc_vbi_infoframe_log(level, dev, &frame->ntsc_vbi); + break; } } EXPORT_SYMBOL(hdmi_infoframe_log); @@ -1840,6 +2004,47 @@ static int hdmi_mpeg_source_infoframe_unpack(struct hdmi_mpeg_source_infoframe * return 0; } +/** + * hdmi_ntsc_vbi_infoframe_unpack() - unpack binary buffer to a HDMI MPEG Source infoframe + * @frame: HDMI MPEG Source infoframe + * @buffer: source buffer + * @size: size of buffer + * + * Unpacks the information contained in binary @buffer into a structured + * @frame of the HDMI MPEG Source information frame. + * Also verifies the checksum as required by section 5.3.5 of the HDMI 1.4 + * specification. + * + * Returns 0 on success or a negative error code on failure. + */ +static int hdmi_ntsc_vbi_infoframe_unpack(struct hdmi_ntsc_vbi_infoframe *frame, + const void *buffer, size_t size) +{ + const u8 *ptr = buffer; + size_t length; + + if (size < HDMI_INFOFRAME_HEADER_SIZE) + return -EINVAL; + + if (ptr[0] != HDMI_INFOFRAME_TYPE_NTSC_VBI || + ptr[1] != 1 || + ptr[2] < 1 || ptr[2] > 27) + return -EINVAL; + + length = ptr[2]; + + if (size < HDMI_INFOFRAME_HEADER_SIZE + length) + return -EINVAL; + + if (hdmi_infoframe_checksum(buffer, + HDMI_INFOFRAME_HEADER_SIZE + length) != 0) + return -EINVAL; + + ptr += HDMI_INFOFRAME_HEADER_SIZE; + + return hdmi_ntsc_vbi_infoframe_init(frame, ptr, length); +} + /** * hdmi_infoframe_unpack() - unpack binary buffer to a HDMI infoframe * @frame: HDMI infoframe @@ -1878,6 +2083,9 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame, case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: ret = hdmi_mpeg_source_infoframe_unpack(&frame->mpeg_source, buffer, size); break; + case HDMI_INFOFRAME_TYPE_NTSC_VBI: + ret = hdmi_ntsc_vbi_infoframe_unpack(&frame->ntsc_vbi, buffer, size); + break; default: ret = -EINVAL; break; diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index 2c9322f7538d..3821516b336c 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -48,6 +48,7 @@ enum hdmi_infoframe_type { HDMI_INFOFRAME_TYPE_SPD = 0x83, HDMI_INFOFRAME_TYPE_AUDIO = 0x84, HDMI_INFOFRAME_TYPE_MPEG_SOURCE = 0x85, + HDMI_INFOFRAME_TYPE_NTSC_VBI = 0x86, }; #define HDMI_IEEE_OUI 0x000c03 @@ -362,6 +363,21 @@ ssize_t hdmi_mpeg_source_infoframe_pack_only(const struct hdmi_mpeg_source_infof void *buffer, size_t size); int hdmi_mpeg_source_infoframe_check(struct hdmi_mpeg_source_infoframe *frame); +struct hdmi_ntsc_vbi_infoframe { + enum hdmi_infoframe_type type; + unsigned char version; + unsigned char length; + unsigned char pes_data_field[27]; +}; + +int hdmi_ntsc_vbi_infoframe_init(struct hdmi_ntsc_vbi_infoframe *frame, + const void *pes_data_field, size_t length); +ssize_t hdmi_ntsc_vbi_infoframe_pack(struct hdmi_ntsc_vbi_infoframe *frame, + void *buffer, size_t size); +ssize_t hdmi_ntsc_vbi_infoframe_pack_only(const struct hdmi_ntsc_vbi_infoframe *frame, + void *buffer, size_t size); +int hdmi_ntsc_vbi_infoframe_check(struct hdmi_ntsc_vbi_infoframe *frame); + /** * union hdmi_infoframe - overall union of all abstract infoframe representations * @any: generic infoframe @@ -370,6 +386,7 @@ int hdmi_mpeg_source_infoframe_check(struct hdmi_mpeg_source_infoframe *frame); * @vendor: union of all vendor infoframes * @audio: audio infoframe * @mpeg_source: mpeg source infoframe + * @ntsc_vbi: ntsc vbi infoframe * * This is used by the generic pack function. This works since all infoframes * have the same header which also indicates which type of infoframe should be @@ -382,6 +399,7 @@ union hdmi_infoframe { union hdmi_vendor_any_infoframe vendor; struct hdmi_audio_infoframe audio; struct hdmi_mpeg_source_infoframe mpeg_source; + struct hdmi_ntsc_vbi_infoframe ntsc_vbi; }; ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, -- 2.16.4