From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B6BC42EEB7 for ; Tue, 20 Jan 2026 12:52:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768913562; cv=none; b=tp6NodTKclhjbYsnU1btBh4gXK2rhPLoXdPk4xX01tNLM8MPCSVHzaK/5XJJRjolOyh7j7H0aq3CShOMUF2ea9xhg2btmejuNH5zNisxY8DA0dTBROwBbi5Fgk+PRdx2TlNwaCOmbNSDckmVlfd2YR7aNCrKStplJwiYIffoDFQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768913562; c=relaxed/simple; bh=1F3bjTrJAQV98e6Ofv6AzI2gvnZHsJNREWk0J7ithrk=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=hlTDt88FoyQJdQ6b1w5A1BlR8aXBTmUnxkUb4bQNyf0XyZT1S1HXohKvdGampsypCJxeyXX+g1nf+/WjlxzeLhGKFQU6BBG+c1T+CCT97NXQjrA5LYTQamiUzuNvHP/gOFs+QavRbAAv1IUYF+Hsk3D+ZMpMzvLDpfFqKij9/+8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=W4lFgX8o; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="W4lFgX8o" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1768913556; bh=1F3bjTrJAQV98e6Ofv6AzI2gvnZHsJNREWk0J7ithrk=; h=Date:Subject:To:References:From:In-Reply-To:From; b=W4lFgX8oLJwt8MA28As+uKkp4IwR2+8J3KRNCcWUzkJTn/ofvLq18HdALvqxgGJb+ gGC/S3JjnjK7lKE+FvVyFZn/EeIq5Ibj2diCrni9ddtzGMU/TDR9Uxwj5Ctquci+JF lKZkPEB/TGYgEjIFBdzmR1xhZKJQ9+71RlyIW7dV+D6PvPG6eMLmsK5vMZqrxdMbdd 5cFGurW0MyA05GFdgw7XDrQvrDGF7+eAUvizlGbMGYLsuqyKEJV3Dh0FOe4fytX9Z3 8wW9uKXr6bjqvAluhYUC51As3OBDQN14CvAuZr/V5NlGEN5F0TNRum3ARAucL3uXfd nPQCiMqfFQ8nQ== Received: from [192.168.1.90] (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 303A517E1355; Tue, 20 Jan 2026 13:52:36 +0100 (CET) Message-ID: <13d33158-b814-4ac1-b8de-ec30ff16c783@collabora.com> Date: Tue, 20 Jan 2026 14:52:35 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/bridge: dw-hdmi-qp: fix multi-channel audio output To: Christian Hewitt , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dmitry Baryshkov , Detlev Casanova , Douglas Anderson , Andy Yan , Sugar Zhang , Luca Ceresoli , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20251206072718.2039874-1-christianshewitt@gmail.com> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20251206072718.2039874-1-christianshewitt@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Christian, On 12/6/25 9:27 AM, Christian Hewitt wrote: > From: Jonas Karlman > > Channel Allocation (PB4) and Level Shift Information (PB5) are > configured with values from PB1 and PB2 due to the wrong offset > being used. This results in missing audio channels or incorrect > speaker placement when playing multi-channel audio. > > Use the correct offset to fix multi-channel audio output. > > Fixes: fd0141d1a8a2 ("drm/bridge: synopsys: Add audio support for dw-hdmi-qp") > Reported-by: Christian Hewitt > Signed-off-by: Jonas Karlman > > --- > buffer is a pointer to u8 while data written to PKT_AUDI_CONTENTS > is u32, so buffer contains audio infoframe header (buffer[0:2]) + > checksum (buffer[3]) + payload byte 1-10 (buffer[4:13]), e.g. > > regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &buffer[3], 1) > .. will write PB0-PB3 to AUDI_CONTENTS1 > > regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS2, &buffer[4], 1) > .. will write PB1-PB4 to AUDI_CONTENTS2, but should be PB4-PB7 > > &buffer[4] will point to payload byte 4 not payload byte 1, due > to u8/u32 and not considering the size of header+checksum (3+1). > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > index f3a13da488e6..7b8a69383dc4 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > @@ -845,7 +845,7 @@ static int dw_hdmi_qp_config_audio_infoframe(struct dw_hdmi_qp *hdmi, > > regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS0, &header_bytes, 1); > regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &buffer[3], 1); > - regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS2, &buffer[4], 1); > + regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS2, &buffer[7], 1); Since making use of regmap_bulk_write(), this could be further optimized as: - regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &buffer[3], 1); - regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS2, &buffer[4], 1); + regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &buffer[3], 2); Regardless, Reviewed-by: Cristian Ciocaltea Please note you also need to provide your SoB, check "Sign your work ..." section in [1]. Regards, Cristian [1] https://www.kernel.org/doc/Documentation/process/submitting-patches.rst