Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1784813pxb; Thu, 16 Sep 2021 15:50:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdrDwxvn8ALyog6Yfpx9khmjatnFaiuBjv5hB4kt0vPBZ6Y7d5dHOOpuiCMnf/MUiWay3z X-Received: by 2002:a17:906:eb56:: with SMTP id mc22mr8437367ejb.542.1631832657510; Thu, 16 Sep 2021 15:50:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631832657; cv=none; d=google.com; s=arc-20160816; b=w/BvMOFwAzsJXfM/e3h07XTq7lzTOb4JiMdsCFbANM1tmQ1EbMvh1gWm/+QkXqPvts iKzFYCLviSf5t3c6rXFvdCWnxZ96/0zc2cW1SuJB3bkhbHjRMEGZHSobvnoBikSl0Hg1 NFglWItoqhxTD7zC+nZ9SPwL6b564kx3GaSc2O7dCui4H/iFccyvtmO4CeoZR7Ri2YyC 22sGZpRg877G/mB5sQta/mfJou/E8cK5/BSTPYyDdNhDx5tATorhjt8OJlr03LWD/PXH B/fGx8DZdVnDaUrz0s+ydvWr5M72YlBIpsaBrGrZxcNodIID122mq5T1a1jnoAXnElCA EvEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/SzzNRrYvgwBzQAv461DyQMY9XlHAGrABBGqYKQvnCY=; b=f9vD+qfOObkAM2/OIFrXIfuzoOxxyEpZwahusAVnMVBfp799D96VMo4EWEzYIsk4kE 7e56tNty+YZVRnKYHNJfwVK+7RMCJszsnQMlT+IGgllqZqUWxiIl1cpI99OMgfPxc3vR rTKaw+c3RjUyYzaXqem82vmF4m8okMmS+vnhsTk+wKpICUd+ZjGa1XrEslsBbw1Nxzkr B/06XMX5SKMCLoUBWkJ8Me7ZnPKvVL1NEm2whNfjvLlZWUIQR9K+ngakghrdXfPlmlyY TMdtys4v8mGkIqNtCFDrx9Csf73zBZJXt22pBbDSTpGMrL7yzwC1YeipwxkKnmCNzGTP pBPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kQMSxuKL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hx2si4930364ejc.561.2021.09.16.15.50.33; Thu, 16 Sep 2021 15:50:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kQMSxuKL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244328AbhIPQqI (ORCPT + 99 others); Thu, 16 Sep 2021 12:46:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:50778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245369AbhIPQkU (ORCPT ); Thu, 16 Sep 2021 12:40:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B6B761465; Thu, 16 Sep 2021 16:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809421; bh=5ANBYZHGT6lDyKTeylFDsecgH0x2gUQwZcIgDogmUro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kQMSxuKL916JyHJyKwCOOhXTy7+QUs3UX2kJjdCAItPMIZ8XLs/NoAuFTK2xVZsiG 97L07BBInEf32EVdUnEq51nZsQ+Vw+CGBz75/MlQuLgRVp240J40XRxnbs/2Ll6DTZ T5JHAaUAsUpIK9SrNUuPXTS7cLGzC1uR9RYQ94fE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dom Cobley , Maxime Ripard , Nicolas Saenz Julienne , Sasha Levin Subject: [PATCH 5.13 141/380] drm/vc4: hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET Date: Thu, 16 Sep 2021 17:58:18 +0200 Message-Id: <20210916155808.846917899@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dom Cobley [ Upstream commit 1698ecb218eb82587dbfc71a2e26ded66e5ecf59 ] Symptom is random switching of speakers when using multichannel. Repeatedly running speakertest -c8 occasionally starts with channels jumbled. This is fixed with HD_CTL_WHOLSMP. The other bit looks beneficial and apears harmless in testing so I'd suggest adding it too. Documentation says: HD_CTL_WHILSMP_SET Wait for whole sample. When this bit is set MAI transmit will start only when there is at least one whole sample available in the fifo. Documentation says: HD_CTL_CHALIGN_SET Channel Align When Overflow. This bit is used to realign the audio channels in case of an overflow. If this bit is set, after the detection of an overflow, equal amount of dummy words to the missing words will be written to fifo, filling up the broken sample and maintaining alignment. Signed-off-by: Dom Cobley Signed-off-by: Maxime Ripard Reviewed-by: Nicolas Saenz Julienne Link: https://patchwork.freedesktop.org/patch/msgid/20210525132354.297468-7-maxime@cerno.tech Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index edee565334d8..155f305e7c4e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1205,7 +1205,9 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd, HDMI_WRITE(HDMI_MAI_CTL, VC4_SET_FIELD(vc4_hdmi->audio.channels, VC4_HD_MAI_CTL_CHNUM) | - VC4_HD_MAI_CTL_ENABLE); + VC4_HD_MAI_CTL_WHOLSMP | + VC4_HD_MAI_CTL_CHALIGN | + VC4_HD_MAI_CTL_ENABLE); break; case SNDRV_PCM_TRIGGER_STOP: HDMI_WRITE(HDMI_MAI_CTL, -- 2.30.2