From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 06/18] video/hdmi: Handle the MPEG Source infoframe Date: Fri, 21 Sep 2018 16:53:14 +0300 Message-ID: <20180921135314.GV5565@intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> <20180920185145.1912-7-ville.syrjala@linux.intel.com> <689d116d-8ac1-a6dc-8857-cb8f9c6e389b@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <689d116d-8ac1-a6dc-8857-cb8f9c6e389b@cisco.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Hans Verkuil Cc: intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBTZXAgMjEsIDIwMTggYXQgMTA6Mjg6MDlBTSArMDIwMCwgSGFucyBWZXJrdWlsIHdy b3RlOgo+IE9uIDA5LzIwLzE4IDIwOjUxLCBWaWxsZSBTeXJqYWxhIHdyb3RlOgo+ID4gRnJvbTog VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiA+IAo+ID4g QWRkIHRoZSBjb2RlIHRvIGRlYWwgd2l0aCB0aGUgTVBFRyBzb3VyY2UgaW5mb2ZyYW1lLgo+ID4g Cj4gPiBCbGluZGx5IHR5cGVkIGZyb20gdGhlIHNwZWMsIGFuZCB0b3RhbGx5IHVudGVzdGVkLgo+ IAo+IEknbSBub3Qgc3VyZSB0aGlzIHBhdGNoIHNob3VsZCBiZSBhZGRlZCBhdCBhbGwuIFRoZSBD VEEtODYxLUcgc3BlYyAoc2VjdGlvbiA2LjcpCj4gc2F5cyB0aGF0IHRoZSBpbXBsZW1lbnRhdGlv biBvZiB0aGlzIGluZm9mcmFtZSBpcyBub3QgcmVjb21tZW5kZWQgZHVlIHRvIHVucmVzb2x2ZWQK PiBpc3N1ZXMuCj4gCj4gSSBkb24ndCB0aGluayBJJ3ZlIGV2ZXIgc2VlbiBpdCBlaXRoZXIuCj4g Cj4gSXQgb2J2aW91c2x5IGRvZXNuJ3QgaHVydCB0byBoYXZlIHRoaXMgY29kZSwgYnV0IEkgcHJl ZmVyIHRvIHdhaXQgdW50aWwgdGhlcmUKPiBhcmUgZGV2aWNlcyB0aGF0IGFjdGl2ZWx5IHNldC91 c2UgdGhpcyBpbmZvZnJhbWUuCgpTdXJlLiBJJ20gdG90YWxseSBmaW5lIHdpdGggbGVhdmluZyBp dCBvdXQuIEp1c3QgZmlndXJlZCBJJ2Qgc2VuZCBpdCBvdXQKaW4gY2FzZSBhbnlvbmUgaGFzIHNv bWUgdXNlIGZvciBpdC4KCj4gCj4gUmVnYXJkcywKPiAKPiAJSGFucwo+IAo+ID4gCj4gPiBDYzog VGhpZXJyeSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGdtYWlsLmNvbT4KPiA+IENjOiBIYW5zIFZl cmt1aWwgPGhhbnMudmVya3VpbEBjaXNjby5jb20+Cj4gPiBDYzogbGludXgtbWVkaWFAdmdlci5r ZXJuZWwub3JnCj4gPiBTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy92aWRlby9oZG1pLmMgfCAy MjkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4g PiAgaW5jbHVkZS9saW51eC9oZG1pLmggfCAgMjcgKysrKysrCj4gPiAgMiBmaWxlcyBjaGFuZ2Vk LCAyNTYgaW5zZXJ0aW9ucygrKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9o ZG1pLmMgYi9kcml2ZXJzL3ZpZGVvL2hkbWkuYwo+ID4gaW5kZXggOTUwN2Y2NjhhNTY5Li4zZDI0 Yzc3NDZjNTEgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL3ZpZGVvL2hkbWkuYwo+ID4gKysrIGIv ZHJpdmVycy92aWRlby9oZG1pLmMKPiA+IEBAIC03MDYsNiArNzA2LDEzMSBAQCBoZG1pX3ZlbmRv cl9hbnlfaW5mb2ZyYW1lX3BhY2sodW5pb24gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZSAqZnJh bWUsCj4gPiAgCXJldHVybiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lX3BhY2tfb25seShmcmFt ZSwgYnVmZmVyLCBzaXplKTsKPiA+ICB9Cj4gPiAgCj4gPiArLyoqCj4gPiArICogaGRtaV9tcGVn X3NvdXJjZV9pbmZvZnJhbWVfaW5pdCgpIC0gaW5pdGlhbGl6ZSBhbiBIRE1JIE1QRUcgU291cmNl IGluZm9mcmFtZQo+ID4gKyAqIEBmcmFtZTogSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUKPiA+ ICsgKgo+ID4gKyAqIFJldHVybnMgMCBvbiBzdWNjZXNzIG9yIGEgbmVnYXRpdmUgZXJyb3IgY29k ZSBvbiBmYWlsdXJlLgo+ID4gKyAqLwo+ID4gK2ludCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFt ZV9pbml0KHN0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAqZnJhbWUpCj4gPiArewo+ ID4gKwltZW1zZXQoZnJhbWUsIDAsIHNpemVvZigqZnJhbWUpKTsKPiA+ICsKPiA+ICsJZnJhbWUt PnR5cGUgPSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09VUkNFOwo+ID4gKwlmcmFtZS0+dmVy c2lvbiA9IDE7Cj4gPiArCWZyYW1lLT5sZW5ndGggPSBIRE1JX01QRUdfU09VUkNFX0lORk9GUkFN RV9TSVpFOwo+ID4gKwo+ID4gKwlyZXR1cm4gMDsKPiA+ICt9Cj4gPiArRVhQT1JUX1NZTUJPTCho ZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9pbml0KTsKPiA+ICsKPiA+ICtzdGF0aWMgaW50IGhk bWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNrX29ubHkoY29uc3Qgc3RydWN0IGhkbWlfbXBl Z19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSkKPiA+ICt7Cj4gPiArCWlmIChmcmFtZS0+dHlwZSAh PSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09VUkNFIHx8Cj4gPiArCSAgICBmcmFtZS0+dmVy c2lvbiAhPSAxIHx8Cj4gPiArCSAgICBmcmFtZS0+bGVuZ3RoICE9IEhETUlfTVBFR19TT1VSQ0Vf SU5GT0ZSQU1FX1NJWkUpCj4gPiArCQlyZXR1cm4gLUVJTlZBTDsKPiA+ICsKPiA+ICsJcmV0dXJu IDA7Cj4gPiArfQo+ID4gKwo+ID4gKy8qKgo+ID4gKyAqIGhkbWlfbXBlZ19zb3VyY2VfaW5mb2Zy YW1lX2NoZWNrKCkgLSBDaGVjayBhbmQgY2hlY2sgYSBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFt ZQo+ID4gKyAqIEBmcmFtZTogSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUKPiA+ICsgKgo+ID4g KyAqIFZhbGlkYXRlcyB0aGF0IHRoZSBpbmZvZnJhbWUgaXMgY29uc2lzdGVudCBhbmQgdXBkYXRl cyBkZXJpdmVkIGZpZWxkcwo+ID4gKyAqIChlZy4gbGVuZ3RoKSBiYXNlZCBvbiBvdGhlciBmaWVs ZHMuCj4gPiArICoKPiA+ICsgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0aXZlIGVy cm9yIGNvZGUgb24gZmFpbHVyZS4KPiA+ICsgKi8KPiA+ICtpbnQgaGRtaV9tcGVnX3NvdXJjZV9p bmZvZnJhbWVfY2hlY2soc3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSkK PiA+ICt7Cj4gPiArCXJldHVybiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVja19vbmx5 KGZyYW1lKTsKPiA+ICt9Cj4gPiArRVhQT1JUX1NZTUJPTChoZG1pX21wZWdfc291cmNlX2luZm9m cmFtZV9jaGVjayk7Cj4gPiArCj4gPiArLyoqCj4gPiArICogaGRtaV9tcGVnX3NvdXJjZV9pbmZv ZnJhbWVfcGFja19vbmx5KCkgLSB3cml0ZSBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZSB0byBi aW5hcnkgYnVmZmVyCj4gPiArICogQGZyYW1lOiBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQo+ ID4gKyAqIEBidWZmZXI6IGRlc3RpbmF0aW9uIGJ1ZmZlcgo+ID4gKyAqIEBzaXplOiBzaXplIG9m IGJ1ZmZlcgo+ID4gKyAqCj4gPiArICogUGFja3MgdGhlIGluZm9ybWF0aW9uIGNvbnRhaW5lZCBp biB0aGUgQGZyYW1lIHN0cnVjdHVyZSBpbnRvIGEgYmluYXJ5Cj4gPiArICogcmVwcmVzZW50YXRp b24gdGhhdCBjYW4gYmUgd3JpdHRlbiBpbnRvIHRoZSBjb3JyZXNwb25kaW5nIGNvbnRyb2xsZXIK PiA+ICsgKiByZWdpc3RlcnMuIEFsc28gY29tcHV0ZXMgdGhlIGNoZWNrc3VtIGFzIHJlcXVpcmVk IGJ5IHNlY3Rpb24gNS4zLjUgb2YKPiA+ICsgKiB0aGUgSERNSSAxLjQgc3BlY2lmaWNhdGlvbi4K PiA+ICsgKgo+ID4gKyAqIFJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyBwYWNrZWQgaW50byB0 aGUgYmluYXJ5IGJ1ZmZlciBvciBhIG5lZ2F0aXZlCj4gPiArICogZXJyb3IgY29kZSBvbiBmYWls dXJlLgo+ID4gKyAqLwo+ID4gK3NzaXplX3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFj a19vbmx5KGNvbnN0IHN0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAqZnJhbWUsCj4g PiArCQkJCQkgICAgIHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpCj4gPiArewo+ID4gKwl1OCAq cHRyID0gYnVmZmVyOwo+ID4gKwlzaXplX3QgbGVuZ3RoOwo+ID4gKwlpbnQgcmV0Owo+ID4gKwo+ ID4gKwlyZXQgPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVja19vbmx5KGZyYW1lKTsK PiA+ICsJaWYgKHJldCkKPiA+ICsJCXJldHVybiByZXQ7Cj4gPiArCj4gPiArCWxlbmd0aCA9IEhE TUlfSU5GT0ZSQU1FX0hFQURFUl9TSVpFICsgZnJhbWUtPmxlbmd0aDsKPiA+ICsKPiA+ICsJaWYg KHNpemUgPCBsZW5ndGgpCj4gPiArCQlyZXR1cm4gLUVOT1NQQzsKPiA+ICsKPiA+ICsJbWVtc2V0 KGJ1ZmZlciwgMCwgc2l6ZSk7Cj4gPiArCj4gPiArCXB0clswXSA9IGZyYW1lLT50eXBlOwo+ID4g KwlwdHJbMV0gPSBmcmFtZS0+dmVyc2lvbjsKPiA+ICsJcHRyWzJdID0gZnJhbWUtPmxlbmd0aDsK PiA+ICsJcHRyWzNdID0gMDsgLyogY2hlY2tzdW0gKi8KPiA+ICsKPiA+ICsJLyogc3RhcnQgaW5m b2ZyYW1lIHBheWxvYWQgKi8KPiA+ICsJcHRyICs9IEhETUlfSU5GT0ZSQU1FX0hFQURFUl9TSVpF Owo+ID4gKwo+ID4gKwlwdHJbMF0gPSBmcmFtZS0+bXBlZ19iaXRfcmF0ZSA+PiAwOwo+ID4gKwlw dHJbMV0gPSBmcmFtZS0+bXBlZ19iaXRfcmF0ZSA+PiA4Owo+ID4gKwlwdHJbMl0gPSBmcmFtZS0+ bXBlZ19iaXRfcmF0ZSA+PiAxNjsKPiA+ICsJcHRyWzNdID0gZnJhbWUtPm1wZWdfYml0X3JhdGUg Pj4gMjQ7Cj4gPiArCXB0cls0XSA9IChmcmFtZS0+ZmllbGRfcmVwZWF0IDw8IDQpIHwgZnJhbWUt Pm1wZWdfZnJhbWU7Cj4gPiArCj4gPiArCWhkbWlfaW5mb2ZyYW1lX3NldF9jaGVja3N1bShidWZm ZXIsIGxlbmd0aCk7Cj4gPiArCj4gPiArCXJldHVybiBsZW5ndGg7Cj4gPiArfQo+ID4gK0VYUE9S VF9TWU1CT0woaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFja19vbmx5KTsKPiA+ICsKPiA+ ICsvKioKPiA+ICsgKiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9wYWNrKCkgLSBDaGVjayBh bmQgY2hlY2sgYSBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZSwKPiA+ICsgKiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhbmQgd3JpdGUgaXQgdG8gYmluYXJ5IGJ1ZmZlcgo+ ID4gKyAqIEBmcmFtZTogSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUKPiA+ICsgKiBAYnVmZmVy OiBkZXN0aW5hdGlvbiBidWZmZXIKPiA+ICsgKiBAc2l6ZTogc2l6ZSBvZiBidWZmZXIKPiA+ICsg Kgo+ID4gKyAqIFZhbGlkYXRlcyB0aGF0IHRoZSBpbmZvZnJhbWUgaXMgY29uc2lzdGVudCBhbmQg dXBkYXRlcyBkZXJpdmVkIGZpZWxkcwo+ID4gKyAqIChlZy4gbGVuZ3RoKSBiYXNlZCBvbiBvdGhl ciBmaWVsZHMsIGFmdGVyIHdoaWNoIHBhY2tzIHRoZSBpbmZvcm1hdGlvbgo+ID4gKyAqIGNvbnRh aW5lZCBpbiB0aGUgQGZyYW1lIHN0cnVjdHVyZSBpbnRvIGEgYmluYXJ5IHJlcHJlc2VudGF0aW9u IHRoYXQKPiA+ICsgKiBjYW4gYmUgd3JpdHRlbiBpbnRvIHRoZSBjb3JyZXNwb25kaW5nIGNvbnRy b2xsZXIgcmVnaXN0ZXJzLiBBbHNvCj4gPiArICogY29tcHV0ZXMgdGhlIGNoZWNrc3VtIGFzIHJl cXVpcmVkIGJ5IHNlY3Rpb24gNS4zLjUgb2YgdGhlIEhETUkgMS40Cj4gPiArICogc3BlY2lmaWNh dGlvbi4KPiA+ICsgKgo+ID4gKyAqIFJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyBwYWNrZWQg aW50byB0aGUgYmluYXJ5IGJ1ZmZlciBvciBhIG5lZ2F0aXZlCj4gPiArICogZXJyb3IgY29kZSBv biBmYWlsdXJlLgo+ID4gKyAqLwo+ID4gK3NzaXplX3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJh bWVfcGFjayhzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWUgKmZyYW1lLAo+ID4gKwkJ CQkJdm9pZCAqYnVmZmVyLCBzaXplX3Qgc2l6ZSkKPiA+ICt7Cj4gPiArCWludCByZXQ7Cj4gPiAr Cj4gPiArCXJldCA9IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNrKGZyYW1lKTsKPiA+ ICsJaWYgKHJldCkKPiA+ICsJCXJldHVybiByZXQ7Cj4gPiArCj4gPiArCXJldHVybiBoZG1pX21w ZWdfc291cmNlX2luZm9mcmFtZV9wYWNrX29ubHkoZnJhbWUsIGJ1ZmZlciwgc2l6ZSk7Cj4gPiAr fQo+ID4gK0VYUE9SVF9TWU1CT0woaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFjayk7Cj4g PiArCj4gPiAgLyoqCj4gPiAgICogaGRtaV9pbmZvZnJhbWVfY2hlY2soKSAtIENoZWNrIGNoZWNr IGEgSERNSSBpbmZvZnJhbWUKPiA+ICAgKiBAZnJhbWU6IEhETUkgaW5mb2ZyYW1lCj4gPiBAQCAt NzI3LDYgKzg1Miw4IEBAIGhkbWlfaW5mb2ZyYW1lX2NoZWNrKHVuaW9uIGhkbWlfaW5mb2ZyYW1l ICpmcmFtZSkKPiA+ICAJCXJldHVybiBoZG1pX2F1ZGlvX2luZm9mcmFtZV9jaGVjaygmZnJhbWUt PmF1ZGlvKTsKPiA+ICAJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX1ZFTkRPUjoKPiA+ICAJCXJl dHVybiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lX2NoZWNrKCZmcmFtZS0+dmVuZG9yKTsKPiA+ ICsJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09VUkNFOgo+ID4gKwkJcmV0dXJuIGhk bWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNrKCZmcmFtZS0+bXBlZ19zb3VyY2UpOwo+ID4g IAlkZWZhdWx0Ogo+ID4gIAkJV0FSTigxLCAiQmFkIGluZm9mcmFtZSB0eXBlICVkXG4iLCBmcmFt ZS0+YW55LnR5cGUpOwo+ID4gIAkJcmV0dXJuIC1FSU5WQUw7Cj4gPiBAQCAtNzcwLDYgKzg5Nywx MCBAQCBoZG1pX2luZm9mcmFtZV9wYWNrX29ubHkoY29uc3QgdW5pb24gaGRtaV9pbmZvZnJhbWUg KmZyYW1lLCB2b2lkICpidWZmZXIsIHNpemVfdAo+ID4gIAkJbGVuZ3RoID0gaGRtaV92ZW5kb3Jf YW55X2luZm9mcmFtZV9wYWNrX29ubHkoJmZyYW1lLT52ZW5kb3IsCj4gPiAgCQkJCQkJCSAgICAg YnVmZmVyLCBzaXplKTsKPiA+ICAJCWJyZWFrOwo+ID4gKwljYXNlIEhETUlfSU5GT0ZSQU1FX1RZ UEVfTVBFR19TT1VSQ0U6Cj4gPiArCQlsZW5ndGggPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFt ZV9wYWNrX29ubHkoJmZyYW1lLT5tcGVnX3NvdXJjZSwKPiA+ICsJCQkJCQkJICAgICAgYnVmZmVy LCBzaXplKTsKPiA+ICsJCWJyZWFrOwo+ID4gIAlkZWZhdWx0Ogo+ID4gIAkJV0FSTigxLCAiQmFk IGluZm9mcmFtZSB0eXBlICVkXG4iLCBmcmFtZS0+YW55LnR5cGUpOwo+ID4gIAkJbGVuZ3RoID0g LUVJTlZBTDsKPiA+IEBAIC04MTYsNiArOTQ3LDEwIEBAIGhkbWlfaW5mb2ZyYW1lX3BhY2sodW5p b24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lLAo+ID4gIAkJbGVuZ3RoID0gaGRtaV92ZW5kb3JfYW55 X2luZm9mcmFtZV9wYWNrKCZmcmFtZS0+dmVuZG9yLAo+ID4gIAkJCQkJCQlidWZmZXIsIHNpemUp Owo+ID4gIAkJYnJlYWs7Cj4gPiArCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQRV9NUEVHX1NPVVJD RToKPiA+ICsJCWxlbmd0aCA9IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2soJmZyYW1l LT5tcGVnX3NvdXJjZSwKPiA+ICsJCQkJCQkJIGJ1ZmZlciwgc2l6ZSk7Cj4gPiArCQlicmVhazsK PiA+ICAJZGVmYXVsdDoKPiA+ICAJCVdBUk4oMSwgIkJhZCBpbmZvZnJhbWUgdHlwZSAlZFxuIiwg ZnJhbWUtPmFueS50eXBlKTsKPiA+ICAJCWxlbmd0aCA9IC1FSU5WQUw7Cj4gPiBAQCAtODM4LDYg Kzk3Myw4IEBAIHN0YXRpYyBjb25zdCBjaGFyICpoZG1pX2luZm9mcmFtZV90eXBlX2dldF9uYW1l KGVudW0gaGRtaV9pbmZvZnJhbWVfdHlwZSB0eXBlKQo+ID4gIAkJcmV0dXJuICJTb3VyY2UgUHJv ZHVjdCBEZXNjcmlwdGlvbiAoU1BEKSI7Cj4gPiAgCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQRV9B VURJTzoKPiA+ICAJCXJldHVybiAiQXVkaW8iOwo+ID4gKwljYXNlIEhETUlfSU5GT0ZSQU1FX1RZ UEVfTVBFR19TT1VSQ0U6Cj4gPiArCQlyZXR1cm4gIk1QRUcgU291cmNlIjsKPiA+ICAJfQo+ID4g IAlyZXR1cm4gIlJlc2VydmVkIjsKPiA+ICB9Cj4gPiBAQCAtMTM0OSw2ICsxNDg2LDQ2IEBAIGhk bWlfdmVuZG9yX2FueV9pbmZvZnJhbWVfbG9nKGNvbnN0IGNoYXIgKmxldmVsLAo+ID4gIAl9Cj4g PiAgfQo+ID4gIAo+ID4gK3N0YXRpYyBjb25zdCBjaGFyICoKPiA+ICtoZG1pX21wZWdfZnJhbWVf Z2V0X25hbWUoZW51bSBoZG1pX21wZWdfZnJhbWUgZnJhbWUpCj4gPiArewo+ID4gKwlpZiAoZnJh bWUgPCAwIHx8IGZyYW1lID4gMykKPiA+ICsJCXJldHVybiAiaW52YWxpZCI7Cj4gPiArCj4gPiAr CXN3aXRjaCAoZnJhbWUpIHsKPiA+ICsJY2FzZSBIRE1JX01QRUdfRlJBTUVfVU5LTk9XTjoKPiA+ ICsJCXJldHVybiAiVW5rbm93biI7Cj4gPiArCWNhc2UgSERNSV9NUEVHX0ZSQU1FX0lfUElDVFVS RToKPiA+ICsJCXJldHVybiAiSSBQaWN0dXJlIjsKPiA+ICsJY2FzZSBIRE1JX01QRUdfRlJBTUVf Ql9QSUNUVVJFOgo+ID4gKwkJcmV0dXJuICJCIFBpY3R1cmUiOwo+ID4gKwljYXNlIEhETUlfTVBF R19GUkFNRV9QX1BJQ1RVUkU6Cj4gPiArCQlyZXR1cm4gIlAgUGljdHVyZSI7Cj4gPiArCX0KPiA+ ICsJcmV0dXJuICJSZXNlcnZlZCI7Cj4gPiArfQo+ID4gKwo+ID4gKy8qKgo+ID4gKyAqIGhkbWlf bXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2xvZygpIC0gbG9nIGluZm8gb2YgSERNSSBNUEVHIFNvdXJj ZSBpbmZvZnJhbWUKPiA+ICsgKiBAbGV2ZWw6IGxvZ2dpbmcgbGV2ZWwKPiA+ICsgKiBAZGV2OiBk ZXZpY2UKPiA+ICsgKiBAZnJhbWU6IEhETUkgTVBFRyBTb3VyY2UgaW5mb2ZyYW1lCj4gPiArICov Cj4gPiArc3RhdGljIHZvaWQgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfbG9nKGNvbnN0IGNo YXIgKmxldmVsLAo+ID4gKwkJCQkJICAgc3RydWN0IGRldmljZSAqZGV2LAo+ID4gKwkJCQkJICAg Y29uc3Qgc3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSkKPiA+ICt7Cj4g PiArCWhkbWlfaW5mb2ZyYW1lX2xvZ19oZWFkZXIobGV2ZWwsIGRldiwKPiA+ICsJCQkJICAoY29u c3Qgc3RydWN0IGhkbWlfYW55X2luZm9mcmFtZSAqKWZyYW1lKTsKPiA+ICsKPiA+ICsJaGRtaV9s b2coIiAgICBNUEVHIGJpdCByYXRlOiAlZCBIelxuIiwKPiA+ICsJCSBmcmFtZS0+bXBlZ19iaXRf cmF0ZSk7Cj4gPiArCWhkbWlfbG9nKCIgICAgTVBFRyBmcmFtZTogJXNcbiIsCj4gPiArCQkgaGRt aV9tcGVnX2ZyYW1lX2dldF9uYW1lKGZyYW1lLT5tcGVnX2ZyYW1lKSk7Cj4gPiArCWhkbWlfbG9n KCIgICAgZmllbGQgcmVwZWF0OiAlc1xuIiwKPiA+ICsJCSBmcmFtZS0+ZmllbGRfcmVwZWF0ID8g IlllcyIgOiAiTm8iKTsKPiA+ICt9Cj4gPiArCj4gPiAgLyoqCj4gPiAgICogaGRtaV9pbmZvZnJh bWVfbG9nKCkgLSBsb2cgaW5mbyBvZiBIRE1JIGluZm9mcmFtZQo+ID4gICAqIEBsZXZlbDogbG9n Z2luZyBsZXZlbAo+ID4gQEAgLTEzNzIsNiArMTU0OSw5IEBAIHZvaWQgaGRtaV9pbmZvZnJhbWVf bG9nKGNvbnN0IGNoYXIgKmxldmVsLAo+ID4gIAljYXNlIEhETUlfSU5GT0ZSQU1FX1RZUEVfVkVO RE9SOgo+ID4gIAkJaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV9sb2cobGV2ZWwsIGRldiwgJmZy YW1lLT52ZW5kb3IpOwo+ID4gIAkJYnJlYWs7Cj4gPiArCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQ RV9NUEVHX1NPVVJDRToKPiA+ICsJCWhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2xvZyhsZXZl bCwgZGV2LCAmZnJhbWUtPm1wZWdfc291cmNlKTsKPiA+ICsJCWJyZWFrOwo+ID4gIAl9Cj4gPiAg fQo+ID4gIEVYUE9SVF9TWU1CT0woaGRtaV9pbmZvZnJhbWVfbG9nKTsKPiA+IEBAIC0xNjE0LDYg KzE3OTQsNTIgQEAgaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV91bnBhY2sodW5pb24gaGRtaV92 ZW5kb3JfYW55X2luZm9mcmFtZSAqZnJhbWUsCj4gPiAgCXJldHVybiAwOwo+ID4gIH0KPiA+ICAK PiA+ICsvKioKPiA+ICsgKiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV91bnBhY2soKSAtIHVu cGFjayBiaW5hcnkgYnVmZmVyIHRvIGEgSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUKPiA+ICsg KiBAZnJhbWU6IEhETUkgTVBFRyBTb3VyY2UgaW5mb2ZyYW1lCj4gPiArICogQGJ1ZmZlcjogc291 cmNlIGJ1ZmZlcgo+ID4gKyAqIEBzaXplOiBzaXplIG9mIGJ1ZmZlcgo+ID4gKyAqCj4gPiArICog VW5wYWNrcyB0aGUgaW5mb3JtYXRpb24gY29udGFpbmVkIGluIGJpbmFyeSBAYnVmZmVyIGludG8g YSBzdHJ1Y3R1cmVkCj4gPiArICogQGZyYW1lIG9mIHRoZSBIRE1JIE1QRUcgU291cmNlIGluZm9y bWF0aW9uIGZyYW1lLgo+ID4gKyAqIEFsc28gdmVyaWZpZXMgdGhlIGNoZWNrc3VtIGFzIHJlcXVp cmVkIGJ5IHNlY3Rpb24gNS4zLjUgb2YgdGhlIEhETUkgMS40Cj4gPiArICogc3BlY2lmaWNhdGlv bi4KPiA+ICsgKgo+ID4gKyAqIFJldHVybnMgMCBvbiBzdWNjZXNzIG9yIGEgbmVnYXRpdmUgZXJy b3IgY29kZSBvbiBmYWlsdXJlLgo+ID4gKyAqLwo+ID4gK3N0YXRpYyBpbnQgaGRtaV9tcGVnX3Nv dXJjZV9pbmZvZnJhbWVfdW5wYWNrKHN0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAq ZnJhbWUsCj4gPiArCQkJCQkgICAgIGNvbnN0IHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpCj4g PiArewo+ID4gKwljb25zdCB1OCAqcHRyID0gYnVmZmVyOwo+ID4gKwlpbnQgcmV0Owo+ID4gKwo+ ID4gKwlpZiAoc2l6ZSA8IEhETUlfSU5GT0ZSQU1FX1NJWkUoTVBFR19TT1VSQ0UpKQo+ID4gKwkJ cmV0dXJuIC1FSU5WQUw7Cj4gPiArCj4gPiArCWlmIChwdHJbMF0gIT0gSERNSV9JTkZPRlJBTUVf VFlQRV9NUEVHX1NPVVJDRSB8fAo+ID4gKwkgICAgcHRyWzFdICE9IDEgfHwKPiA+ICsJICAgIHB0 clsyXSAhPSBIRE1JX01QRUdfU09VUkNFX0lORk9GUkFNRV9TSVpFKSB7Cj4gPiArCQlyZXR1cm4g LUVJTlZBTDsKPiA+ICsJfQo+ID4gKwo+ID4gKwlpZiAoaGRtaV9pbmZvZnJhbWVfY2hlY2tzdW0o YnVmZmVyLCBIRE1JX0lORk9GUkFNRV9TSVpFKE1QRUdfU09VUkNFKSkgIT0gMCkKPiA+ICsJCXJl dHVybiAtRUlOVkFMOwo+ID4gKwo+ID4gKwlyZXQgPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFt ZV9pbml0KGZyYW1lKTsKPiA+ICsJaWYgKHJldCkKPiA+ICsJCXJldHVybiByZXQ7Cj4gPiArCj4g PiArCXB0ciArPSBIRE1JX0lORk9GUkFNRV9IRUFERVJfU0laRTsKPiA+ICsKPiA+ICsJZnJhbWUt Pm1wZWdfYml0X3JhdGUgPQo+ID4gKwkJKHB0clswXSA8PCAwKSB8IChwdHJbMV0gPDwgOCkgfAo+ ID4gKwkJKHB0clsyXSA8PCAxNikgfCAocHRyWzNdIDw8IDI0KTsKPiA+ICsJZnJhbWUtPm1wZWdf ZnJhbWUgPSBwdHJbNF0gJiAweDM7Cj4gPiArCWZyYW1lLT5maWVsZF9yZXBlYXQgPSBwdHJbNF0g JiAweDEwOwo+ID4gKwo+ID4gKwlyZXR1cm4gMDsKPiA+ICt9Cj4gPiArCj4gPiAgLyoqCj4gPiAg ICogaGRtaV9pbmZvZnJhbWVfdW5wYWNrKCkgLSB1bnBhY2sgYmluYXJ5IGJ1ZmZlciB0byBhIEhE TUkgaW5mb2ZyYW1lCj4gPiAgICogQGZyYW1lOiBIRE1JIGluZm9mcmFtZQo+ID4gQEAgLTE2NDks NiArMTg3NSw5IEBAIGludCBoZG1pX2luZm9mcmFtZV91bnBhY2sodW5pb24gaGRtaV9pbmZvZnJh bWUgKmZyYW1lLAo+ID4gIAljYXNlIEhETUlfSU5GT0ZSQU1FX1RZUEVfVkVORE9SOgo+ID4gIAkJ cmV0ID0gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV91bnBhY2soJmZyYW1lLT52ZW5kb3IsIGJ1 ZmZlciwgc2l6ZSk7Cj4gPiAgCQlicmVhazsKPiA+ICsJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBF X01QRUdfU09VUkNFOgo+ID4gKwkJcmV0ID0gaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfdW5w YWNrKCZmcmFtZS0+bXBlZ19zb3VyY2UsIGJ1ZmZlciwgc2l6ZSk7Cj4gPiArCQlicmVhazsKPiA+ ICAJZGVmYXVsdDoKPiA+ICAJCXJldCA9IC1FSU5WQUw7Cj4gPiAgCQlicmVhazsKPiA+IGRpZmYg LS1naXQgYS9pbmNsdWRlL2xpbnV4L2hkbWkuaCBiL2luY2x1ZGUvbGludXgvaGRtaS5oCj4gPiBp bmRleCA4MDUyMWQ5NTkxYTEuLjJjOTMyMmY3NTM4ZCAxMDA2NDQKPiA+IC0tLSBhL2luY2x1ZGUv bGludXgvaGRtaS5oCj4gPiArKysgYi9pbmNsdWRlL2xpbnV4L2hkbWkuaAo+ID4gQEAgLTQ3LDYg KzQ3LDcgQEAgZW51bSBoZG1pX2luZm9mcmFtZV90eXBlIHsKPiA+ICAJSERNSV9JTkZPRlJBTUVf VFlQRV9BVkkgPSAweDgyLAo+ID4gIAlIRE1JX0lORk9GUkFNRV9UWVBFX1NQRCA9IDB4ODMsCj4g PiAgCUhETUlfSU5GT0ZSQU1FX1RZUEVfQVVESU8gPSAweDg0LAo+ID4gKwlIRE1JX0lORk9GUkFN RV9UWVBFX01QRUdfU09VUkNFID0gMHg4NSwKPiA+ICB9Owo+ID4gIAo+ID4gICNkZWZpbmUgSERN SV9JRUVFX09VSSAweDAwMGMwMwo+ID4gQEAgLTU1LDYgKzU2LDcgQEAgZW51bSBoZG1pX2luZm9m cmFtZV90eXBlIHsKPiA+ICAjZGVmaW5lIEhETUlfQVZJX0lORk9GUkFNRV9TSVpFICAgIDEzCj4g PiAgI2RlZmluZSBIRE1JX1NQRF9JTkZPRlJBTUVfU0laRSAgICAyNQo+ID4gICNkZWZpbmUgSERN SV9BVURJT19JTkZPRlJBTUVfU0laRSAgMTAKPiA+ICsjZGVmaW5lIEhETUlfTVBFR19TT1VSQ0Vf SU5GT0ZSQU1FX1NJWkUgIDEwCj4gPiAgCj4gPiAgI2RlZmluZSBIRE1JX0lORk9GUkFNRV9TSVpF KHR5cGUpCVwKPiA+ICAJKEhETUlfSU5GT0ZSQU1FX0hFQURFUl9TSVpFICsgSERNSV8gIyMgdHlw ZSAjIyBfSU5GT0ZSQU1FX1NJWkUpCj4gPiBAQCAtMzM3LDYgKzMzOSwyOSBAQCB1bmlvbiBoZG1p X3ZlbmRvcl9hbnlfaW5mb2ZyYW1lIHsKPiA+ICAJc3RydWN0IGhkbWlfdmVuZG9yX2luZm9mcmFt ZSBoZG1pOwo+ID4gIH07Cj4gPiAgCj4gPiArZW51bSBoZG1pX21wZWdfZnJhbWUgewo+ID4gKwlI RE1JX01QRUdfRlJBTUVfVU5LTk9XTiwKPiA+ICsJSERNSV9NUEVHX0ZSQU1FX0lfUElDVFVSRSwK PiA+ICsJSERNSV9NUEVHX0ZSQU1FX0JfUElDVFVSRSwKPiA+ICsJSERNSV9NUEVHX0ZSQU1FX1Bf UElDVFVSRSwKPiA+ICt9Owo+ID4gKwo+ID4gK3N0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9m cmFtZSB7Cj4gPiArCWVudW0gaGRtaV9pbmZvZnJhbWVfdHlwZSB0eXBlOwo+ID4gKwl1bnNpZ25l ZCBjaGFyIHZlcnNpb247Cj4gPiArCXVuc2lnbmVkIGNoYXIgbGVuZ3RoOwo+ID4gKwl1bnNpZ25l ZCBpbnQgbXBlZ19iaXRfcmF0ZTsKPiA+ICsJZW51bSBoZG1pX21wZWdfZnJhbWUgbXBlZ19mcmFt ZTsKPiA+ICsJYm9vbCBmaWVsZF9yZXBlYXQ7Cj4gPiArfTsKPiA+ICsKPiA+ICtpbnQgaGRtaV9t cGVnX3NvdXJjZV9pbmZvZnJhbWVfaW5pdChzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJh bWUgKmZyYW1lKTsKPiA+ICtzc2l6ZV90IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2so c3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSwKPiA+ICsJCQkJCXZvaWQg KmJ1ZmZlciwgc2l6ZV90IHNpemUpOwo+ID4gK3NzaXplX3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZv ZnJhbWVfcGFja19vbmx5KGNvbnN0IHN0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAq ZnJhbWUsCj4gPiArCQkJCQkgICAgIHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpOwo+ID4gK2lu dCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVjayhzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJj ZV9pbmZvZnJhbWUgKmZyYW1lKTsKPiA+ICsKPiA+ICAvKioKPiA+ICAgKiB1bmlvbiBoZG1pX2lu Zm9mcmFtZSAtIG92ZXJhbGwgdW5pb24gb2YgYWxsIGFic3RyYWN0IGluZm9mcmFtZSByZXByZXNl bnRhdGlvbnMKPiA+ICAgKiBAYW55OiBnZW5lcmljIGluZm9mcmFtZQo+ID4gQEAgLTM0NCw2ICsz NjksNyBAQCB1bmlvbiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lIHsKPiA+ICAgKiBAc3BkOiBz cGQgaW5mb2ZyYW1lCj4gPiAgICogQHZlbmRvcjogdW5pb24gb2YgYWxsIHZlbmRvciBpbmZvZnJh bWVzCj4gPiAgICogQGF1ZGlvOiBhdWRpbyBpbmZvZnJhbWUKPiA+ICsgKiBAbXBlZ19zb3VyY2U6 IG1wZWcgc291cmNlIGluZm9mcmFtZQo+ID4gICAqCj4gPiAgICogVGhpcyBpcyB1c2VkIGJ5IHRo ZSBnZW5lcmljIHBhY2sgZnVuY3Rpb24uIFRoaXMgd29ya3Mgc2luY2UgYWxsIGluZm9mcmFtZXMK PiA+ICAgKiBoYXZlIHRoZSBzYW1lIGhlYWRlciB3aGljaCBhbHNvIGluZGljYXRlcyB3aGljaCB0 eXBlIG9mIGluZm9mcmFtZSBzaG91bGQgYmUKPiA+IEBAIC0zNTUsNiArMzgxLDcgQEAgdW5pb24g aGRtaV9pbmZvZnJhbWUgewo+ID4gIAlzdHJ1Y3QgaGRtaV9zcGRfaW5mb2ZyYW1lIHNwZDsKPiA+ ICAJdW5pb24gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZSB2ZW5kb3I7Cj4gPiAgCXN0cnVjdCBo ZG1pX2F1ZGlvX2luZm9mcmFtZSBhdWRpbzsKPiA+ICsJc3RydWN0IGhkbWlfbXBlZ19zb3VyY2Vf aW5mb2ZyYW1lIG1wZWdfc291cmNlOwo+ID4gIH07Cj4gPiAgCj4gPiAgc3NpemVfdCBoZG1pX2lu Zm9mcmFtZV9wYWNrKHVuaW9uIGhkbWlfaW5mb2ZyYW1lICpmcmFtZSwgdm9pZCAqYnVmZmVyLAo+ ID4gCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga04.intel.com ([192.55.52.120]:48514 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728184AbeIUTmR (ORCPT ); Fri, 21 Sep 2018 15:42:17 -0400 Date: Fri, 21 Sep 2018 16:53:14 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Hans Verkuil Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , linux-media@vger.kernel.org Subject: Re: [PATCH 06/18] video/hdmi: Handle the MPEG Source infoframe Message-ID: <20180921135314.GV5565@intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> <20180920185145.1912-7-ville.syrjala@linux.intel.com> <689d116d-8ac1-a6dc-8857-cb8f9c6e389b@cisco.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <689d116d-8ac1-a6dc-8857-cb8f9c6e389b@cisco.com> Sender: linux-media-owner@vger.kernel.org List-ID: On Fri, Sep 21, 2018 at 10:28:09AM +0200, Hans Verkuil wrote: > On 09/20/18 20:51, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > Add the code to deal with the MPEG source infoframe. > > > > Blindly typed from the spec, and totally untested. > > I'm not sure this patch should be added at all. The CTA-861-G spec (section 6.7) > says that the implementation of this infoframe is not recommended due to unresolved > issues. > > I don't think I've ever seen it either. > > It obviously doesn't hurt to have this code, but I prefer to wait until there > are devices that actively set/use this infoframe. Sure. I'm totally fine with leaving it out. Just figured I'd send it out in case anyone has some use for it. > > Regards, > > Hans > > > > > Cc: Thierry Reding > > Cc: Hans Verkuil > > Cc: linux-media@vger.kernel.org > > Signed-off-by: Ville Syrjälä > > --- > > drivers/video/hdmi.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++ > > include/linux/hdmi.h | 27 ++++++ > > 2 files changed, 256 insertions(+) > > > > diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c > > index 9507f668a569..3d24c7746c51 100644 > > --- a/drivers/video/hdmi.c > > +++ b/drivers/video/hdmi.c > > @@ -706,6 +706,131 @@ hdmi_vendor_any_infoframe_pack(union hdmi_vendor_any_infoframe *frame, > > return hdmi_vendor_any_infoframe_pack_only(frame, buffer, size); > > } > > > > +/** > > + * hdmi_mpeg_source_infoframe_init() - initialize an HDMI MPEG Source infoframe > > + * @frame: HDMI MPEG Source infoframe > > + * > > + * Returns 0 on success or a negative error code on failure. > > + */ > > +int hdmi_mpeg_source_infoframe_init(struct hdmi_mpeg_source_infoframe *frame) > > +{ > > + memset(frame, 0, sizeof(*frame)); > > + > > + frame->type = HDMI_INFOFRAME_TYPE_MPEG_SOURCE; > > + frame->version = 1; > > + frame->length = HDMI_MPEG_SOURCE_INFOFRAME_SIZE; > > + > > + return 0; > > +} > > +EXPORT_SYMBOL(hdmi_mpeg_source_infoframe_init); > > + > > +static int hdmi_mpeg_source_infoframe_check_only(const struct hdmi_mpeg_source_infoframe *frame) > > +{ > > + if (frame->type != HDMI_INFOFRAME_TYPE_MPEG_SOURCE || > > + frame->version != 1 || > > + frame->length != HDMI_MPEG_SOURCE_INFOFRAME_SIZE) > > + return -EINVAL; > > + > > + return 0; > > +} > > + > > +/** > > + * hdmi_mpeg_source_infoframe_check() - Check and check a HDMI MPEG Source infoframe > > + * @frame: HDMI MPEG Source 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_mpeg_source_infoframe_check(struct hdmi_mpeg_source_infoframe *frame) > > +{ > > + return hdmi_mpeg_source_infoframe_check_only(frame); > > +} > > +EXPORT_SYMBOL(hdmi_mpeg_source_infoframe_check); > > + > > +/** > > + * hdmi_mpeg_source_infoframe_pack_only() - write HDMI MPEG Source infoframe to binary buffer > > + * @frame: HDMI MPEG Source 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_mpeg_source_infoframe_pack_only(const struct hdmi_mpeg_source_infoframe *frame, > > + void *buffer, size_t size) > > +{ > > + u8 *ptr = buffer; > > + size_t length; > > + int ret; > > + > > + ret = hdmi_mpeg_source_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; > > + > > + ptr[0] = frame->mpeg_bit_rate >> 0; > > + ptr[1] = frame->mpeg_bit_rate >> 8; > > + ptr[2] = frame->mpeg_bit_rate >> 16; > > + ptr[3] = frame->mpeg_bit_rate >> 24; > > + ptr[4] = (frame->field_repeat << 4) | frame->mpeg_frame; > > + > > + hdmi_infoframe_set_checksum(buffer, length); > > + > > + return length; > > +} > > +EXPORT_SYMBOL(hdmi_mpeg_source_infoframe_pack_only); > > + > > +/** > > + * hdmi_mpeg_source_infoframe_pack() - Check and check a HDMI MPEG Source infoframe, > > + * and write it to binary buffer > > + * @frame: HDMI MPEG Source 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_mpeg_source_infoframe_pack(struct hdmi_mpeg_source_infoframe *frame, > > + void *buffer, size_t size) > > +{ > > + int ret; > > + > > + ret = hdmi_mpeg_source_infoframe_check(frame); > > + if (ret) > > + return ret; > > + > > + return hdmi_mpeg_source_infoframe_pack_only(frame, buffer, size); > > +} > > +EXPORT_SYMBOL(hdmi_mpeg_source_infoframe_pack); > > + > > /** > > * hdmi_infoframe_check() - Check check a HDMI infoframe > > * @frame: HDMI infoframe > > @@ -727,6 +852,8 @@ hdmi_infoframe_check(union hdmi_infoframe *frame) > > return hdmi_audio_infoframe_check(&frame->audio); > > case HDMI_INFOFRAME_TYPE_VENDOR: > > return hdmi_vendor_any_infoframe_check(&frame->vendor); > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + return hdmi_mpeg_source_infoframe_check(&frame->mpeg_source); > > default: > > WARN(1, "Bad infoframe type %d\n", frame->any.type); > > return -EINVAL; > > @@ -770,6 +897,10 @@ hdmi_infoframe_pack_only(const union hdmi_infoframe *frame, void *buffer, size_t > > length = hdmi_vendor_any_infoframe_pack_only(&frame->vendor, > > buffer, size); > > break; > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + length = hdmi_mpeg_source_infoframe_pack_only(&frame->mpeg_source, > > + buffer, size); > > + break; > > default: > > WARN(1, "Bad infoframe type %d\n", frame->any.type); > > length = -EINVAL; > > @@ -816,6 +947,10 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, > > length = hdmi_vendor_any_infoframe_pack(&frame->vendor, > > buffer, size); > > break; > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + length = hdmi_mpeg_source_infoframe_pack(&frame->mpeg_source, > > + buffer, size); > > + break; > > default: > > WARN(1, "Bad infoframe type %d\n", frame->any.type); > > length = -EINVAL; > > @@ -838,6 +973,8 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type) > > return "Source Product Description (SPD)"; > > case HDMI_INFOFRAME_TYPE_AUDIO: > > return "Audio"; > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + return "MPEG Source"; > > } > > return "Reserved"; > > } > > @@ -1349,6 +1486,46 @@ hdmi_vendor_any_infoframe_log(const char *level, > > } > > } > > > > +static const char * > > +hdmi_mpeg_frame_get_name(enum hdmi_mpeg_frame frame) > > +{ > > + if (frame < 0 || frame > 3) > > + return "invalid"; > > + > > + switch (frame) { > > + case HDMI_MPEG_FRAME_UNKNOWN: > > + return "Unknown"; > > + case HDMI_MPEG_FRAME_I_PICTURE: > > + return "I Picture"; > > + case HDMI_MPEG_FRAME_B_PICTURE: > > + return "B Picture"; > > + case HDMI_MPEG_FRAME_P_PICTURE: > > + return "P Picture"; > > + } > > + return "Reserved"; > > +} > > + > > +/** > > + * hdmi_mpeg_source_infoframe_log() - log info of HDMI MPEG Source infoframe > > + * @level: logging level > > + * @dev: device > > + * @frame: HDMI MPEG Source infoframe > > + */ > > +static void hdmi_mpeg_source_infoframe_log(const char *level, > > + struct device *dev, > > + const struct hdmi_mpeg_source_infoframe *frame) > > +{ > > + hdmi_infoframe_log_header(level, dev, > > + (const struct hdmi_any_infoframe *)frame); > > + > > + hdmi_log(" MPEG bit rate: %d Hz\n", > > + frame->mpeg_bit_rate); > > + hdmi_log(" MPEG frame: %s\n", > > + hdmi_mpeg_frame_get_name(frame->mpeg_frame)); > > + hdmi_log(" field repeat: %s\n", > > + frame->field_repeat ? "Yes" : "No"); > > +} > > + > > /** > > * hdmi_infoframe_log() - log info of HDMI infoframe > > * @level: logging level > > @@ -1372,6 +1549,9 @@ void hdmi_infoframe_log(const char *level, > > case HDMI_INFOFRAME_TYPE_VENDOR: > > hdmi_vendor_any_infoframe_log(level, dev, &frame->vendor); > > break; > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + hdmi_mpeg_source_infoframe_log(level, dev, &frame->mpeg_source); > > + break; > > } > > } > > EXPORT_SYMBOL(hdmi_infoframe_log); > > @@ -1614,6 +1794,52 @@ hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame, > > return 0; > > } > > > > +/** > > + * hdmi_mpeg_source_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_mpeg_source_infoframe_unpack(struct hdmi_mpeg_source_infoframe *frame, > > + const void *buffer, size_t size) > > +{ > > + const u8 *ptr = buffer; > > + int ret; > > + > > + if (size < HDMI_INFOFRAME_SIZE(MPEG_SOURCE)) > > + return -EINVAL; > > + > > + if (ptr[0] != HDMI_INFOFRAME_TYPE_MPEG_SOURCE || > > + ptr[1] != 1 || > > + ptr[2] != HDMI_MPEG_SOURCE_INFOFRAME_SIZE) { > > + return -EINVAL; > > + } > > + > > + if (hdmi_infoframe_checksum(buffer, HDMI_INFOFRAME_SIZE(MPEG_SOURCE)) != 0) > > + return -EINVAL; > > + > > + ret = hdmi_mpeg_source_infoframe_init(frame); > > + if (ret) > > + return ret; > > + > > + ptr += HDMI_INFOFRAME_HEADER_SIZE; > > + > > + frame->mpeg_bit_rate = > > + (ptr[0] << 0) | (ptr[1] << 8) | > > + (ptr[2] << 16) | (ptr[3] << 24); > > + frame->mpeg_frame = ptr[4] & 0x3; > > + frame->field_repeat = ptr[4] & 0x10; > > + > > + return 0; > > +} > > + > > /** > > * hdmi_infoframe_unpack() - unpack binary buffer to a HDMI infoframe > > * @frame: HDMI infoframe > > @@ -1649,6 +1875,9 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame, > > case HDMI_INFOFRAME_TYPE_VENDOR: > > ret = hdmi_vendor_any_infoframe_unpack(&frame->vendor, buffer, size); > > break; > > + case HDMI_INFOFRAME_TYPE_MPEG_SOURCE: > > + ret = hdmi_mpeg_source_infoframe_unpack(&frame->mpeg_source, buffer, size); > > + break; > > default: > > ret = -EINVAL; > > break; > > diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h > > index 80521d9591a1..2c9322f7538d 100644 > > --- a/include/linux/hdmi.h > > +++ b/include/linux/hdmi.h > > @@ -47,6 +47,7 @@ enum hdmi_infoframe_type { > > HDMI_INFOFRAME_TYPE_AVI = 0x82, > > HDMI_INFOFRAME_TYPE_SPD = 0x83, > > HDMI_INFOFRAME_TYPE_AUDIO = 0x84, > > + HDMI_INFOFRAME_TYPE_MPEG_SOURCE = 0x85, > > }; > > > > #define HDMI_IEEE_OUI 0x000c03 > > @@ -55,6 +56,7 @@ enum hdmi_infoframe_type { > > #define HDMI_AVI_INFOFRAME_SIZE 13 > > #define HDMI_SPD_INFOFRAME_SIZE 25 > > #define HDMI_AUDIO_INFOFRAME_SIZE 10 > > +#define HDMI_MPEG_SOURCE_INFOFRAME_SIZE 10 > > > > #define HDMI_INFOFRAME_SIZE(type) \ > > (HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE) > > @@ -337,6 +339,29 @@ union hdmi_vendor_any_infoframe { > > struct hdmi_vendor_infoframe hdmi; > > }; > > > > +enum hdmi_mpeg_frame { > > + HDMI_MPEG_FRAME_UNKNOWN, > > + HDMI_MPEG_FRAME_I_PICTURE, > > + HDMI_MPEG_FRAME_B_PICTURE, > > + HDMI_MPEG_FRAME_P_PICTURE, > > +}; > > + > > +struct hdmi_mpeg_source_infoframe { > > + enum hdmi_infoframe_type type; > > + unsigned char version; > > + unsigned char length; > > + unsigned int mpeg_bit_rate; > > + enum hdmi_mpeg_frame mpeg_frame; > > + bool field_repeat; > > +}; > > + > > +int hdmi_mpeg_source_infoframe_init(struct hdmi_mpeg_source_infoframe *frame); > > +ssize_t hdmi_mpeg_source_infoframe_pack(struct hdmi_mpeg_source_infoframe *frame, > > + void *buffer, size_t size); > > +ssize_t hdmi_mpeg_source_infoframe_pack_only(const struct hdmi_mpeg_source_infoframe *frame, > > + void *buffer, size_t size); > > +int hdmi_mpeg_source_infoframe_check(struct hdmi_mpeg_source_infoframe *frame); > > + > > /** > > * union hdmi_infoframe - overall union of all abstract infoframe representations > > * @any: generic infoframe > > @@ -344,6 +369,7 @@ union hdmi_vendor_any_infoframe { > > * @spd: spd infoframe > > * @vendor: union of all vendor infoframes > > * @audio: audio infoframe > > + * @mpeg_source: mpeg source 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 > > @@ -355,6 +381,7 @@ union hdmi_infoframe { > > struct hdmi_spd_infoframe spd; > > union hdmi_vendor_any_infoframe vendor; > > struct hdmi_audio_infoframe audio; > > + struct hdmi_mpeg_source_infoframe mpeg_source; > > }; > > > > ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, > > -- Ville Syrjälä Intel