From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 06/18] video/hdmi: Handle the MPEG Source infoframe Date: Thu, 20 Sep 2018 21:51:33 +0300 Message-ID: <20180920185145.1912-7-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: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Hans Verkuil , linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFk ZCB0aGUgY29kZSB0byBkZWFsIHdpdGggdGhlIE1QRUcgc291cmNlIGluZm9mcmFtZS4KCkJsaW5k bHkgdHlwZWQgZnJvbSB0aGUgc3BlYywgYW5kIHRvdGFsbHkgdW50ZXN0ZWQuCgpDYzogVGhpZXJy eSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGdtYWlsLmNvbT4KQ2M6IEhhbnMgVmVya3VpbCA8aGFu cy52ZXJrdWlsQGNpc2NvLmNvbT4KQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpTaWdu ZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvdmlkZW8vaGRtaS5jIHwgMjI5ICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9saW51eC9oZG1pLmggfCAgMjcg KysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDI1NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy92aWRlby9oZG1pLmMgYi9kcml2ZXJzL3ZpZGVvL2hkbWkuYwppbmRleCA5NTA3ZjY2 OGE1NjkuLjNkMjRjNzc0NmM1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9oZG1pLmMKKysr IGIvZHJpdmVycy92aWRlby9oZG1pLmMKQEAgLTcwNiw2ICs3MDYsMTMxIEBAIGhkbWlfdmVuZG9y X2FueV9pbmZvZnJhbWVfcGFjayh1bmlvbiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lICpmcmFt ZSwKIAlyZXR1cm4gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV9wYWNrX29ubHkoZnJhbWUsIGJ1 ZmZlciwgc2l6ZSk7CiB9CiAKKy8qKgorICogaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfaW5p dCgpIC0gaW5pdGlhbGl6ZSBhbiBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQorICogQGZyYW1l OiBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQorICoKKyAqIFJldHVybnMgMCBvbiBzdWNjZXNz IG9yIGEgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWlsdXJlLgorICovCitpbnQgaGRtaV9tcGVn X3NvdXJjZV9pbmZvZnJhbWVfaW5pdChzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWUg KmZyYW1lKQoreworCW1lbXNldChmcmFtZSwgMCwgc2l6ZW9mKCpmcmFtZSkpOworCisJZnJhbWUt PnR5cGUgPSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09VUkNFOworCWZyYW1lLT52ZXJzaW9u ID0gMTsKKwlmcmFtZS0+bGVuZ3RoID0gSERNSV9NUEVHX1NPVVJDRV9JTkZPRlJBTUVfU0laRTsK KworCXJldHVybiAwOworfQorRVhQT1JUX1NZTUJPTChoZG1pX21wZWdfc291cmNlX2luZm9mcmFt ZV9pbml0KTsKKworc3RhdGljIGludCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVja19v bmx5KGNvbnN0IHN0cnVjdCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAqZnJhbWUpCit7CisJ aWYgKGZyYW1lLT50eXBlICE9IEhETUlfSU5GT0ZSQU1FX1RZUEVfTVBFR19TT1VSQ0UgfHwKKwkg ICAgZnJhbWUtPnZlcnNpb24gIT0gMSB8fAorCSAgICBmcmFtZS0+bGVuZ3RoICE9IEhETUlfTVBF R19TT1VSQ0VfSU5GT0ZSQU1FX1NJWkUpCisJCXJldHVybiAtRUlOVkFMOworCisJcmV0dXJuIDA7 Cit9CisKKy8qKgorICogaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfY2hlY2soKSAtIENoZWNr IGFuZCBjaGVjayBhIEhETUkgTVBFRyBTb3VyY2UgaW5mb2ZyYW1lCisgKiBAZnJhbWU6IEhETUkg TVBFRyBTb3VyY2UgaW5mb2ZyYW1lCisgKgorICogVmFsaWRhdGVzIHRoYXQgdGhlIGluZm9mcmFt ZSBpcyBjb25zaXN0ZW50IGFuZCB1cGRhdGVzIGRlcml2ZWQgZmllbGRzCisgKiAoZWcuIGxlbmd0 aCkgYmFzZWQgb24gb3RoZXIgZmllbGRzLgorICoKKyAqIFJldHVybnMgMCBvbiBzdWNjZXNzIG9y IGEgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWlsdXJlLgorICovCitpbnQgaGRtaV9tcGVnX3Nv dXJjZV9pbmZvZnJhbWVfY2hlY2soc3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpm cmFtZSkKK3sKKwlyZXR1cm4gaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfY2hlY2tfb25seShm cmFtZSk7Cit9CitFWFBPUlRfU1lNQk9MKGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNr KTsKKworLyoqCisgKiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9wYWNrX29ubHkoKSAtIHdy aXRlIEhETUkgTVBFRyBTb3VyY2UgaW5mb2ZyYW1lIHRvIGJpbmFyeSBidWZmZXIKKyAqIEBmcmFt ZTogSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUKKyAqIEBidWZmZXI6IGRlc3RpbmF0aW9uIGJ1 ZmZlcgorICogQHNpemU6IHNpemUgb2YgYnVmZmVyCisgKgorICogUGFja3MgdGhlIGluZm9ybWF0 aW9uIGNvbnRhaW5lZCBpbiB0aGUgQGZyYW1lIHN0cnVjdHVyZSBpbnRvIGEgYmluYXJ5CisgKiBy ZXByZXNlbnRhdGlvbiB0aGF0IGNhbiBiZSB3cml0dGVuIGludG8gdGhlIGNvcnJlc3BvbmRpbmcg Y29udHJvbGxlcgorICogcmVnaXN0ZXJzLiBBbHNvIGNvbXB1dGVzIHRoZSBjaGVja3N1bSBhcyBy ZXF1aXJlZCBieSBzZWN0aW9uIDUuMy41IG9mCisgKiB0aGUgSERNSSAxLjQgc3BlY2lmaWNhdGlv bi4KKyAqCisgKiBSZXR1cm5zIHRoZSBudW1iZXIgb2YgYnl0ZXMgcGFja2VkIGludG8gdGhlIGJp bmFyeSBidWZmZXIgb3IgYSBuZWdhdGl2ZQorICogZXJyb3IgY29kZSBvbiBmYWlsdXJlLgorICov Citzc2l6ZV90IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2tfb25seShjb25zdCBzdHJ1 Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWUgKmZyYW1lLAorCQkJCQkgICAgIHZvaWQgKmJ1 ZmZlciwgc2l6ZV90IHNpemUpCit7CisJdTggKnB0ciA9IGJ1ZmZlcjsKKwlzaXplX3QgbGVuZ3Ro OworCWludCByZXQ7CisKKwlyZXQgPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9jaGVja19v bmx5KGZyYW1lKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJbGVuZ3RoID0gSERNSV9J TkZPRlJBTUVfSEVBREVSX1NJWkUgKyBmcmFtZS0+bGVuZ3RoOworCisJaWYgKHNpemUgPCBsZW5n dGgpCisJCXJldHVybiAtRU5PU1BDOworCisJbWVtc2V0KGJ1ZmZlciwgMCwgc2l6ZSk7CisKKwlw dHJbMF0gPSBmcmFtZS0+dHlwZTsKKwlwdHJbMV0gPSBmcmFtZS0+dmVyc2lvbjsKKwlwdHJbMl0g PSBmcmFtZS0+bGVuZ3RoOworCXB0clszXSA9IDA7IC8qIGNoZWNrc3VtICovCisKKwkvKiBzdGFy dCBpbmZvZnJhbWUgcGF5bG9hZCAqLworCXB0ciArPSBIRE1JX0lORk9GUkFNRV9IRUFERVJfU0la RTsKKworCXB0clswXSA9IGZyYW1lLT5tcGVnX2JpdF9yYXRlID4+IDA7CisJcHRyWzFdID0gZnJh bWUtPm1wZWdfYml0X3JhdGUgPj4gODsKKwlwdHJbMl0gPSBmcmFtZS0+bXBlZ19iaXRfcmF0ZSA+ PiAxNjsKKwlwdHJbM10gPSBmcmFtZS0+bXBlZ19iaXRfcmF0ZSA+PiAyNDsKKwlwdHJbNF0gPSAo ZnJhbWUtPmZpZWxkX3JlcGVhdCA8PCA0KSB8IGZyYW1lLT5tcGVnX2ZyYW1lOworCisJaGRtaV9p bmZvZnJhbWVfc2V0X2NoZWNrc3VtKGJ1ZmZlciwgbGVuZ3RoKTsKKworCXJldHVybiBsZW5ndGg7 Cit9CitFWFBPUlRfU1lNQk9MKGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2tfb25seSk7 CisKKy8qKgorICogaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFjaygpIC0gQ2hlY2sgYW5k IGNoZWNrIGEgSERNSSBNUEVHIFNvdXJjZSBpbmZvZnJhbWUsCisgKiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBhbmQgd3JpdGUgaXQgdG8gYmluYXJ5IGJ1ZmZlcgorICogQGZy YW1lOiBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQorICogQGJ1ZmZlcjogZGVzdGluYXRpb24g YnVmZmVyCisgKiBAc2l6ZTogc2l6ZSBvZiBidWZmZXIKKyAqCisgKiBWYWxpZGF0ZXMgdGhhdCB0 aGUgaW5mb2ZyYW1lIGlzIGNvbnNpc3RlbnQgYW5kIHVwZGF0ZXMgZGVyaXZlZCBmaWVsZHMKKyAq IChlZy4gbGVuZ3RoKSBiYXNlZCBvbiBvdGhlciBmaWVsZHMsIGFmdGVyIHdoaWNoIHBhY2tzIHRo ZSBpbmZvcm1hdGlvbgorICogY29udGFpbmVkIGluIHRoZSBAZnJhbWUgc3RydWN0dXJlIGludG8g YSBiaW5hcnkgcmVwcmVzZW50YXRpb24gdGhhdAorICogY2FuIGJlIHdyaXR0ZW4gaW50byB0aGUg Y29ycmVzcG9uZGluZyBjb250cm9sbGVyIHJlZ2lzdGVycy4gQWxzbworICogY29tcHV0ZXMgdGhl IGNoZWNrc3VtIGFzIHJlcXVpcmVkIGJ5IHNlY3Rpb24gNS4zLjUgb2YgdGhlIEhETUkgMS40Cisg KiBzcGVjaWZpY2F0aW9uLgorICoKKyAqIFJldHVybnMgdGhlIG51bWJlciBvZiBieXRlcyBwYWNr ZWQgaW50byB0aGUgYmluYXJ5IGJ1ZmZlciBvciBhIG5lZ2F0aXZlCisgKiBlcnJvciBjb2RlIG9u IGZhaWx1cmUuCisgKi8KK3NzaXplX3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFjayhz dHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWUgKmZyYW1lLAorCQkJCQl2b2lkICpidWZm ZXIsIHNpemVfdCBzaXplKQoreworCWludCByZXQ7CisKKwlyZXQgPSBoZG1pX21wZWdfc291cmNl X2luZm9mcmFtZV9jaGVjayhmcmFtZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJl dHVybiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9wYWNrX29ubHkoZnJhbWUsIGJ1ZmZlciwg c2l6ZSk7Cit9CitFWFBPUlRfU1lNQk9MKGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX3BhY2sp OworCiAvKioKICAqIGhkbWlfaW5mb2ZyYW1lX2NoZWNrKCkgLSBDaGVjayBjaGVjayBhIEhETUkg aW5mb2ZyYW1lCiAgKiBAZnJhbWU6IEhETUkgaW5mb2ZyYW1lCkBAIC03MjcsNiArODUyLDggQEAg aGRtaV9pbmZvZnJhbWVfY2hlY2sodW5pb24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lKQogCQlyZXR1 cm4gaGRtaV9hdWRpb19pbmZvZnJhbWVfY2hlY2soJmZyYW1lLT5hdWRpbyk7CiAJY2FzZSBIRE1J X0lORk9GUkFNRV9UWVBFX1ZFTkRPUjoKIAkJcmV0dXJuIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJh bWVfY2hlY2soJmZyYW1lLT52ZW5kb3IpOworCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQRV9NUEVH X1NPVVJDRToKKwkJcmV0dXJuIGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2NoZWNrKCZmcmFt ZS0+bXBlZ19zb3VyY2UpOwogCWRlZmF1bHQ6CiAJCVdBUk4oMSwgIkJhZCBpbmZvZnJhbWUgdHlw ZSAlZFxuIiwgZnJhbWUtPmFueS50eXBlKTsKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC03NzAsNiAr ODk3LDEwIEBAIGhkbWlfaW5mb2ZyYW1lX3BhY2tfb25seShjb25zdCB1bmlvbiBoZG1pX2luZm9m cmFtZSAqZnJhbWUsIHZvaWQgKmJ1ZmZlciwgc2l6ZV90CiAJCWxlbmd0aCA9IGhkbWlfdmVuZG9y X2FueV9pbmZvZnJhbWVfcGFja19vbmx5KCZmcmFtZS0+dmVuZG9yLAogCQkJCQkJCSAgICAgYnVm ZmVyLCBzaXplKTsKIAkJYnJlYWs7CisJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09V UkNFOgorCQlsZW5ndGggPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9wYWNrX29ubHkoJmZy YW1lLT5tcGVnX3NvdXJjZSwKKwkJCQkJCQkgICAgICBidWZmZXIsIHNpemUpOworCQlicmVhazsK IAlkZWZhdWx0OgogCQlXQVJOKDEsICJCYWQgaW5mb2ZyYW1lIHR5cGUgJWRcbiIsIGZyYW1lLT5h bnkudHlwZSk7CiAJCWxlbmd0aCA9IC1FSU5WQUw7CkBAIC04MTYsNiArOTQ3LDEwIEBAIGhkbWlf aW5mb2ZyYW1lX3BhY2sodW5pb24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lLAogCQlsZW5ndGggPSBo ZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lX3BhY2soJmZyYW1lLT52ZW5kb3IsCiAJCQkJCQkJYnVm ZmVyLCBzaXplKTsKIAkJYnJlYWs7CisJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX01QRUdfU09V UkNFOgorCQlsZW5ndGggPSBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9wYWNrKCZmcmFtZS0+ bXBlZ19zb3VyY2UsCisJCQkJCQkJIGJ1ZmZlciwgc2l6ZSk7CisJCWJyZWFrOwogCWRlZmF1bHQ6 CiAJCVdBUk4oMSwgIkJhZCBpbmZvZnJhbWUgdHlwZSAlZFxuIiwgZnJhbWUtPmFueS50eXBlKTsK IAkJbGVuZ3RoID0gLUVJTlZBTDsKQEAgLTgzOCw2ICs5NzMsOCBAQCBzdGF0aWMgY29uc3QgY2hh ciAqaGRtaV9pbmZvZnJhbWVfdHlwZV9nZXRfbmFtZShlbnVtIGhkbWlfaW5mb2ZyYW1lX3R5cGUg dHlwZSkKIAkJcmV0dXJuICJTb3VyY2UgUHJvZHVjdCBEZXNjcmlwdGlvbiAoU1BEKSI7CiAJY2Fz ZSBIRE1JX0lORk9GUkFNRV9UWVBFX0FVRElPOgogCQlyZXR1cm4gIkF1ZGlvIjsKKwljYXNlIEhE TUlfSU5GT0ZSQU1FX1RZUEVfTVBFR19TT1VSQ0U6CisJCXJldHVybiAiTVBFRyBTb3VyY2UiOwog CX0KIAlyZXR1cm4gIlJlc2VydmVkIjsKIH0KQEAgLTEzNDksNiArMTQ4Niw0NiBAQCBoZG1pX3Zl bmRvcl9hbnlfaW5mb2ZyYW1lX2xvZyhjb25zdCBjaGFyICpsZXZlbCwKIAl9CiB9CiAKK3N0YXRp YyBjb25zdCBjaGFyICoKK2hkbWlfbXBlZ19mcmFtZV9nZXRfbmFtZShlbnVtIGhkbWlfbXBlZ19m cmFtZSBmcmFtZSkKK3sKKwlpZiAoZnJhbWUgPCAwIHx8IGZyYW1lID4gMykKKwkJcmV0dXJuICJp bnZhbGlkIjsKKworCXN3aXRjaCAoZnJhbWUpIHsKKwljYXNlIEhETUlfTVBFR19GUkFNRV9VTktO T1dOOgorCQlyZXR1cm4gIlVua25vd24iOworCWNhc2UgSERNSV9NUEVHX0ZSQU1FX0lfUElDVFVS RToKKwkJcmV0dXJuICJJIFBpY3R1cmUiOworCWNhc2UgSERNSV9NUEVHX0ZSQU1FX0JfUElDVFVS RToKKwkJcmV0dXJuICJCIFBpY3R1cmUiOworCWNhc2UgSERNSV9NUEVHX0ZSQU1FX1BfUElDVFVS RToKKwkJcmV0dXJuICJQIFBpY3R1cmUiOworCX0KKwlyZXR1cm4gIlJlc2VydmVkIjsKK30KKwor LyoqCisgKiBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9sb2coKSAtIGxvZyBpbmZvIG9mIEhE TUkgTVBFRyBTb3VyY2UgaW5mb2ZyYW1lCisgKiBAbGV2ZWw6IGxvZ2dpbmcgbGV2ZWwKKyAqIEBk ZXY6IGRldmljZQorICogQGZyYW1lOiBIRE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQorICovCitz dGF0aWMgdm9pZCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV9sb2coY29uc3QgY2hhciAqbGV2 ZWwsCisJCQkJCSAgIHN0cnVjdCBkZXZpY2UgKmRldiwKKwkJCQkJICAgY29uc3Qgc3RydWN0IGhk bWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSkKK3sKKwloZG1pX2luZm9mcmFtZV9sb2df aGVhZGVyKGxldmVsLCBkZXYsCisJCQkJICAoY29uc3Qgc3RydWN0IGhkbWlfYW55X2luZm9mcmFt ZSAqKWZyYW1lKTsKKworCWhkbWlfbG9nKCIgICAgTVBFRyBiaXQgcmF0ZTogJWQgSHpcbiIsCisJ CSBmcmFtZS0+bXBlZ19iaXRfcmF0ZSk7CisJaGRtaV9sb2coIiAgICBNUEVHIGZyYW1lOiAlc1xu IiwKKwkJIGhkbWlfbXBlZ19mcmFtZV9nZXRfbmFtZShmcmFtZS0+bXBlZ19mcmFtZSkpOworCWhk bWlfbG9nKCIgICAgZmllbGQgcmVwZWF0OiAlc1xuIiwKKwkJIGZyYW1lLT5maWVsZF9yZXBlYXQg PyAiWWVzIiA6ICJObyIpOworfQorCiAvKioKICAqIGhkbWlfaW5mb2ZyYW1lX2xvZygpIC0gbG9n IGluZm8gb2YgSERNSSBpbmZvZnJhbWUKICAqIEBsZXZlbDogbG9nZ2luZyBsZXZlbApAQCAtMTM3 Miw2ICsxNTQ5LDkgQEAgdm9pZCBoZG1pX2luZm9mcmFtZV9sb2coY29uc3QgY2hhciAqbGV2ZWws CiAJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX1ZFTkRPUjoKIAkJaGRtaV92ZW5kb3JfYW55X2lu Zm9mcmFtZV9sb2cobGV2ZWwsIGRldiwgJmZyYW1lLT52ZW5kb3IpOwogCQlicmVhazsKKwljYXNl IEhETUlfSU5GT0ZSQU1FX1RZUEVfTVBFR19TT1VSQ0U6CisJCWhkbWlfbXBlZ19zb3VyY2VfaW5m b2ZyYW1lX2xvZyhsZXZlbCwgZGV2LCAmZnJhbWUtPm1wZWdfc291cmNlKTsKKwkJYnJlYWs7CiAJ fQogfQogRVhQT1JUX1NZTUJPTChoZG1pX2luZm9mcmFtZV9sb2cpOwpAQCAtMTYxNCw2ICsxNzk0 LDUyIEBAIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWVfdW5wYWNrKHVuaW9uIGhkbWlfdmVuZG9y X2FueV9pbmZvZnJhbWUgKmZyYW1lLAogCXJldHVybiAwOwogfQogCisvKioKKyAqIGhkbWlfbXBl Z19zb3VyY2VfaW5mb2ZyYW1lX3VucGFjaygpIC0gdW5wYWNrIGJpbmFyeSBidWZmZXIgdG8gYSBI RE1JIE1QRUcgU291cmNlIGluZm9mcmFtZQorICogQGZyYW1lOiBIRE1JIE1QRUcgU291cmNlIGlu Zm9mcmFtZQorICogQGJ1ZmZlcjogc291cmNlIGJ1ZmZlcgorICogQHNpemU6IHNpemUgb2YgYnVm ZmVyCisgKgorICogVW5wYWNrcyB0aGUgaW5mb3JtYXRpb24gY29udGFpbmVkIGluIGJpbmFyeSBA YnVmZmVyIGludG8gYSBzdHJ1Y3R1cmVkCisgKiBAZnJhbWUgb2YgdGhlIEhETUkgTVBFRyBTb3Vy Y2UgaW5mb3JtYXRpb24gZnJhbWUuCisgKiBBbHNvIHZlcmlmaWVzIHRoZSBjaGVja3N1bSBhcyBy ZXF1aXJlZCBieSBzZWN0aW9uIDUuMy41IG9mIHRoZSBIRE1JIDEuNAorICogc3BlY2lmaWNhdGlv bi4KKyAqCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0aXZlIGVycm9yIGNvZGUg b24gZmFpbHVyZS4KKyAqLworc3RhdGljIGludCBoZG1pX21wZWdfc291cmNlX2luZm9mcmFtZV91 bnBhY2soc3RydWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSwKKwkJCQkJICAg ICBjb25zdCB2b2lkICpidWZmZXIsIHNpemVfdCBzaXplKQoreworCWNvbnN0IHU4ICpwdHIgPSBi dWZmZXI7CisJaW50IHJldDsKKworCWlmIChzaXplIDwgSERNSV9JTkZPRlJBTUVfU0laRShNUEVH X1NPVVJDRSkpCisJCXJldHVybiAtRUlOVkFMOworCisJaWYgKHB0clswXSAhPSBIRE1JX0lORk9G UkFNRV9UWVBFX01QRUdfU09VUkNFIHx8CisJICAgIHB0clsxXSAhPSAxIHx8CisJICAgIHB0clsy XSAhPSBIRE1JX01QRUdfU09VUkNFX0lORk9GUkFNRV9TSVpFKSB7CisJCXJldHVybiAtRUlOVkFM OworCX0KKworCWlmIChoZG1pX2luZm9mcmFtZV9jaGVja3N1bShidWZmZXIsIEhETUlfSU5GT0ZS QU1FX1NJWkUoTVBFR19TT1VSQ0UpKSAhPSAwKQorCQlyZXR1cm4gLUVJTlZBTDsKKworCXJldCA9 IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lX2luaXQoZnJhbWUpOworCWlmIChyZXQpCisJCXJl dHVybiByZXQ7CisKKwlwdHIgKz0gSERNSV9JTkZPRlJBTUVfSEVBREVSX1NJWkU7CisKKwlmcmFt ZS0+bXBlZ19iaXRfcmF0ZSA9CisJCShwdHJbMF0gPDwgMCkgfCAocHRyWzFdIDw8IDgpIHwKKwkJ KHB0clsyXSA8PCAxNikgfCAocHRyWzNdIDw8IDI0KTsKKwlmcmFtZS0+bXBlZ19mcmFtZSA9IHB0 cls0XSAmIDB4MzsKKwlmcmFtZS0+ZmllbGRfcmVwZWF0ID0gcHRyWzRdICYgMHgxMDsKKworCXJl dHVybiAwOworfQorCiAvKioKICAqIGhkbWlfaW5mb2ZyYW1lX3VucGFjaygpIC0gdW5wYWNrIGJp bmFyeSBidWZmZXIgdG8gYSBIRE1JIGluZm9mcmFtZQogICogQGZyYW1lOiBIRE1JIGluZm9mcmFt ZQpAQCAtMTY0OSw2ICsxODc1LDkgQEAgaW50IGhkbWlfaW5mb2ZyYW1lX3VucGFjayh1bmlvbiBo ZG1pX2luZm9mcmFtZSAqZnJhbWUsCiAJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX1ZFTkRPUjoK IAkJcmV0ID0gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV91bnBhY2soJmZyYW1lLT52ZW5kb3Is IGJ1ZmZlciwgc2l6ZSk7CiAJCWJyZWFrOworCWNhc2UgSERNSV9JTkZPRlJBTUVfVFlQRV9NUEVH X1NPVVJDRToKKwkJcmV0ID0gaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfdW5wYWNrKCZmcmFt ZS0+bXBlZ19zb3VyY2UsIGJ1ZmZlciwgc2l6ZSk7CisJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCXJl dCA9IC1FSU5WQUw7CiAJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9oZG1pLmgg Yi9pbmNsdWRlL2xpbnV4L2hkbWkuaAppbmRleCA4MDUyMWQ5NTkxYTEuLjJjOTMyMmY3NTM4ZCAx MDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9oZG1pLmgKKysrIGIvaW5jbHVkZS9saW51eC9oZG1p LmgKQEAgLTQ3LDYgKzQ3LDcgQEAgZW51bSBoZG1pX2luZm9mcmFtZV90eXBlIHsKIAlIRE1JX0lO Rk9GUkFNRV9UWVBFX0FWSSA9IDB4ODIsCiAJSERNSV9JTkZPRlJBTUVfVFlQRV9TUEQgPSAweDgz LAogCUhETUlfSU5GT0ZSQU1FX1RZUEVfQVVESU8gPSAweDg0LAorCUhETUlfSU5GT0ZSQU1FX1RZ UEVfTVBFR19TT1VSQ0UgPSAweDg1LAogfTsKIAogI2RlZmluZSBIRE1JX0lFRUVfT1VJIDB4MDAw YzAzCkBAIC01NSw2ICs1Niw3IEBAIGVudW0gaGRtaV9pbmZvZnJhbWVfdHlwZSB7CiAjZGVmaW5l IEhETUlfQVZJX0lORk9GUkFNRV9TSVpFICAgIDEzCiAjZGVmaW5lIEhETUlfU1BEX0lORk9GUkFN RV9TSVpFICAgIDI1CiAjZGVmaW5lIEhETUlfQVVESU9fSU5GT0ZSQU1FX1NJWkUgIDEwCisjZGVm aW5lIEhETUlfTVBFR19TT1VSQ0VfSU5GT0ZSQU1FX1NJWkUgIDEwCiAKICNkZWZpbmUgSERNSV9J TkZPRlJBTUVfU0laRSh0eXBlKQlcCiAJKEhETUlfSU5GT0ZSQU1FX0hFQURFUl9TSVpFICsgSERN SV8gIyMgdHlwZSAjIyBfSU5GT0ZSQU1FX1NJWkUpCkBAIC0zMzcsNiArMzM5LDI5IEBAIHVuaW9u IGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWUgewogCXN0cnVjdCBoZG1pX3ZlbmRvcl9pbmZvZnJh bWUgaGRtaTsKIH07CiAKK2VudW0gaGRtaV9tcGVnX2ZyYW1lIHsKKwlIRE1JX01QRUdfRlJBTUVf VU5LTk9XTiwKKwlIRE1JX01QRUdfRlJBTUVfSV9QSUNUVVJFLAorCUhETUlfTVBFR19GUkFNRV9C X1BJQ1RVUkUsCisJSERNSV9NUEVHX0ZSQU1FX1BfUElDVFVSRSwKK307CisKK3N0cnVjdCBoZG1p X21wZWdfc291cmNlX2luZm9mcmFtZSB7CisJZW51bSBoZG1pX2luZm9mcmFtZV90eXBlIHR5cGU7 CisJdW5zaWduZWQgY2hhciB2ZXJzaW9uOworCXVuc2lnbmVkIGNoYXIgbGVuZ3RoOworCXVuc2ln bmVkIGludCBtcGVnX2JpdF9yYXRlOworCWVudW0gaGRtaV9tcGVnX2ZyYW1lIG1wZWdfZnJhbWU7 CisJYm9vbCBmaWVsZF9yZXBlYXQ7Cit9OworCitpbnQgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJh bWVfaW5pdChzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWUgKmZyYW1lKTsKK3NzaXpl X3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFjayhzdHJ1Y3QgaGRtaV9tcGVnX3NvdXJj ZV9pbmZvZnJhbWUgKmZyYW1lLAorCQkJCQl2b2lkICpidWZmZXIsIHNpemVfdCBzaXplKTsKK3Nz aXplX3QgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfcGFja19vbmx5KGNvbnN0IHN0cnVjdCBo ZG1pX21wZWdfc291cmNlX2luZm9mcmFtZSAqZnJhbWUsCisJCQkJCSAgICAgdm9pZCAqYnVmZmVy LCBzaXplX3Qgc2l6ZSk7CitpbnQgaGRtaV9tcGVnX3NvdXJjZV9pbmZvZnJhbWVfY2hlY2soc3Ry dWN0IGhkbWlfbXBlZ19zb3VyY2VfaW5mb2ZyYW1lICpmcmFtZSk7CisKIC8qKgogICogdW5pb24g aGRtaV9pbmZvZnJhbWUgLSBvdmVyYWxsIHVuaW9uIG9mIGFsbCBhYnN0cmFjdCBpbmZvZnJhbWUg cmVwcmVzZW50YXRpb25zCiAgKiBAYW55OiBnZW5lcmljIGluZm9mcmFtZQpAQCAtMzQ0LDYgKzM2 OSw3IEBAIHVuaW9uIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWUgewogICogQHNwZDogc3BkIGlu Zm9mcmFtZQogICogQHZlbmRvcjogdW5pb24gb2YgYWxsIHZlbmRvciBpbmZvZnJhbWVzCiAgKiBA YXVkaW86IGF1ZGlvIGluZm9mcmFtZQorICogQG1wZWdfc291cmNlOiBtcGVnIHNvdXJjZSBpbmZv ZnJhbWUKICAqCiAgKiBUaGlzIGlzIHVzZWQgYnkgdGhlIGdlbmVyaWMgcGFjayBmdW5jdGlvbi4g VGhpcyB3b3JrcyBzaW5jZSBhbGwgaW5mb2ZyYW1lcwogICogaGF2ZSB0aGUgc2FtZSBoZWFkZXIg d2hpY2ggYWxzbyBpbmRpY2F0ZXMgd2hpY2ggdHlwZSBvZiBpbmZvZnJhbWUgc2hvdWxkIGJlCkBA IC0zNTUsNiArMzgxLDcgQEAgdW5pb24gaGRtaV9pbmZvZnJhbWUgewogCXN0cnVjdCBoZG1pX3Nw ZF9pbmZvZnJhbWUgc3BkOwogCXVuaW9uIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWUgdmVuZG9y OwogCXN0cnVjdCBoZG1pX2F1ZGlvX2luZm9mcmFtZSBhdWRpbzsKKwlzdHJ1Y3QgaGRtaV9tcGVn X3NvdXJjZV9pbmZvZnJhbWUgbXBlZ19zb3VyY2U7CiB9OwogCiBzc2l6ZV90IGhkbWlfaW5mb2Zy YW1lX3BhY2sodW5pb24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lLCB2b2lkICpidWZmZXIsCi0tIAoy LjE2LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= 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 S1727171AbeIUAhD (ORCPT ); Thu, 20 Sep 2018 20:37:03 -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 06/18] video/hdmi: Handle the MPEG Source infoframe Date: Thu, 20 Sep 2018 21:51:33 +0300 Message-Id: <20180920185145.1912-7-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 MPEG source infoframe. 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 | 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, -- 2.16.4