From patchwork Wed Jul 26 12:37:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zhong X-Patchwork-Id: 9864721 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8FE2B602B1 for ; Wed, 26 Jul 2017 12:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F50728723 for ; Wed, 26 Jul 2017 12:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 742F82874C; Wed, 26 Jul 2017 12:38:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D828228723 for ; Wed, 26 Jul 2017 12:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=McBOtq11SIsLV6/KIEkD6xf4R5c8++fCdQnkKZYa3UU=; b=qX9 PjxuyEfX0obcQCb86k/GYR77y8S+subu5USyUc9gKVkJd94LjkhoG+ii/Dn/otZnjfHop46IL6zjE nTuAFi/nbjh8bjwmzpxt8Ff6RusaXRkIBX4DZl10U1gIFaLhqF5kJxXksmVkl6DhXrpQi5rPa3gon sORO0esow41yMkECfPyysxttgqyjf8h8AReekgqlUeUNjO+G3HILuES8f0g7U1LLQYbC151eAovOc Gf+SWZC3M/LgCR6Rf7u8Hxv0xyiTkTKHTnjjqqHqsrSStUjFE0oM5Umrn2emVmwftB81R8rhaN/4F RvcBseszHhbUeD6MxRrsKhFKzEjkXVA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1daLZk-0004mf-II; Wed, 26 Jul 2017 12:38:04 +0000 Received: from mail-pg0-f66.google.com ([74.125.83.66]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1daLZh-0004jw-6q for linux-rockchip@lists.infradead.org; Wed, 26 Jul 2017 12:38:03 +0000 Received: by mail-pg0-f66.google.com with SMTP id 123so6687501pgj.0 for ; Wed, 26 Jul 2017 05:37:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tRReJ+xeBweZBpZoOsyecZghj8M0eHc3v5btZjJ03yI=; b=k/EyoOEuRJ2SKZ3jxlrMhJ/jAiJhgTwEPvGvoXJftW7pWQAXg9NWHzYuhmZO0x+U98 ss8Ur667F007FIW07vNDI8mzImEnNrmz1NRN7MCBCCRKBXvVf1Dx6PUfL0UoaoOmMQvu C4kfMD8/ZIDTwMrXnnsB++suGpbtvpcHgZMxxFnPq+W3vAzOmbjiBfjLGXIL3t4POK4N nTpIMFUgDdqaHedk/bLVGx4kcSRFLJNWBk7Y37P9XjQGbZi3ZTpJVjXl2CyQQqrIL2yU LaAQjzbuaXn13rYPEhOXi93Htbm2IIJ0us73i4VOlbGnhQGMRfBWA5Ol472moCWGzniY ngSQ== X-Gm-Message-State: AIVw110jeSSbLMQCmzhYz+xC10GrEl77b9ZkcYUOj88mPCTXdtR07ork 6mhzItUrkM4xtA== X-Received: by 10.99.124.5 with SMTP id x5mr768269pgc.280.1501072659266; Wed, 26 Jul 2017 05:37:39 -0700 (PDT) Received: from chris-X240.lan ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id k4sm20884767pgr.74.2017.07.26.05.37.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 05:37:37 -0700 (PDT) From: Chris Zhong To: seanpaul@chromium.org, dianders@chromium.org, briannorris@chromium.org Subject: [PATCH v3 1/2] video/hdmi: Introduce helpers for the HDMI audio infoframe payload Date: Wed, 26 Jul 2017 20:37:29 +0800 Message-Id: <1501072650-32653-1-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170726_053801_319540_5C485973 X-CRM114-Status: GOOD ( 11.85 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Thierry Reding , heiko@sntech.de, Bartlomiej Zolnierkiewicz , Daniel Vetter , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jose Abreu , Chris Zhong , Shashank Sharma , mark.yao@rock-chips.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The DP is using the same audio infoframe payload as hdmi, per DP 1.3 spec, but it has a different header. Provide a new interface here, it just packs the payload. Signed-off-by: Chris Zhong --- Changes in v3: - add size < HDMI_AUDIO_INFOFRAME_SIZE check according to Doug's advice Changes in v2: None drivers/video/hdmi.c | 66 ++++++++++++++++++++++++++++++++++++++-------------- include/linux/hdmi.h | 2 ++ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 1cf907e..9868050 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -240,6 +240,49 @@ int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame) EXPORT_SYMBOL(hdmi_audio_infoframe_init); /** + * hdmi_audio_infoframe_pack_payload() - write HDMI audio infoframe payload to + * binary buffer + * @frame: HDMI audio 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. + * + * Returns 0 on success or a negative error code on failure. + */ +ssize_t hdmi_audio_infoframe_pack_payload(struct hdmi_audio_infoframe *frame, + void *buffer, size_t size) +{ + unsigned char channels; + u8 *ptr = buffer; + + if (size < frame->length || size < HDMI_AUDIO_INFOFRAME_SIZE) + return -ENOSPC; + + memset(buffer, 0, size); + + if (frame->channels >= 2) + channels = frame->channels - 1; + else + channels = 0; + + ptr[0] = ((frame->coding_type & 0xf) << 4) | (channels & 0x7); + ptr[1] = ((frame->sample_frequency & 0x7) << 2) | + (frame->sample_size & 0x3); + ptr[2] = frame->coding_type_ext & 0x1f; + ptr[3] = frame->channel_allocation; + ptr[4] = (frame->level_shift_value & 0xf) << 3; + + if (frame->downmix_inhibit) + ptr[4] |= BIT(7); + + return 0; +} +EXPORT_SYMBOL(hdmi_audio_infoframe_pack_payload); + +/** * hdmi_audio_infoframe_pack() - write HDMI audio infoframe to binary buffer * @frame: HDMI audio infoframe * @buffer: destination buffer @@ -256,22 +299,15 @@ EXPORT_SYMBOL(hdmi_audio_infoframe_init); ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, void *buffer, size_t size) { - unsigned char channels; u8 *ptr = buffer; size_t length; + int ret; length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; if (size < length) return -ENOSPC; - memset(buffer, 0, size); - - if (frame->channels >= 2) - channels = frame->channels - 1; - else - channels = 0; - ptr[0] = frame->type; ptr[1] = frame->version; ptr[2] = frame->length; @@ -279,16 +315,10 @@ ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, /* start infoframe payload */ ptr += HDMI_INFOFRAME_HEADER_SIZE; - - ptr[0] = ((frame->coding_type & 0xf) << 4) | (channels & 0x7); - ptr[1] = ((frame->sample_frequency & 0x7) << 2) | - (frame->sample_size & 0x3); - ptr[2] = frame->coding_type_ext & 0x1f; - ptr[3] = frame->channel_allocation; - ptr[4] = (frame->level_shift_value & 0xf) << 3; - - if (frame->downmix_inhibit) - ptr[4] |= BIT(7); + ret = hdmi_audio_infoframe_pack_payload(frame, ptr, + size - HDMI_INFOFRAME_HEADER_SIZE); + if (ret) + return ret; hdmi_infoframe_set_checksum(buffer, length); diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index d271ff2..a4be132 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -272,6 +272,8 @@ struct hdmi_audio_infoframe { int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame); ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, void *buffer, size_t size); +ssize_t hdmi_audio_infoframe_pack_payload(struct hdmi_audio_infoframe *frame, + void *buffer, size_t size); enum hdmi_3d_structure { HDMI_3D_STRUCTURE_INVALID = -1,