From patchwork Mon Oct 24 11:32:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp438169wru; Mon, 24 Oct 2022 06:00:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7935VAjktaAXEsu0nm6NxULroB0hX5DpzviK0g1ZrZdvEGha3hK8fS5eMhJlbQPaqUOfrS X-Received: by 2002:a63:e54:0:b0:46a:ff3d:5ee1 with SMTP id 20-20020a630e54000000b0046aff3d5ee1mr28579644pgo.194.1666616455240; Mon, 24 Oct 2022 06:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616454; cv=none; d=google.com; s=arc-20160816; b=nSv7372LXos+Wj8seqWL3DwugFiVegIEgAa0yM2i/+79Ew3DGzmhTv008y9+S4w80v ynP5t4GdEUTOjDE0ddSG0LUKO1toBtD3ZDKoe9avdXlpy2/DRuCuK9jmUMtm7jaDxipi NvrI7zydU9srQPq8SLuc25A4wajkek/rt25VQT6m74dnG5EAPLi4DnC3a3tpTe4s9PBk XQGKTLVsqTiqN9ILRimi/UDy4KUHXIbQ3g+Kk0fDJAmmibmNod0bat2uveEBM0GkiPNL CVdXrjRzShkjIxFvyX7XqsRBLyAFRM5a4f49xrQZOMW+0srmT36QzxMheHRZRl/1Edsm d4iw== 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=6H1Hvnwj2euc17t+bG5TWAgsWSzGQ/yT94DqGdOj5vI=; b=es9hB6JvXfGMZx6CPGd6mp8aEdz9qU/K7eZPaeZmgCOdmpvomIAN1C0eJ0YXhLQLX9 dNLmoWHlOREXfRCxzfMXe5xT1rSof7nokC3kDT1xfmBSg8M5jYykG/aCzRXZ87/nLvuK zn2cs+C9Vd4mYyahZ3Uc819Ljm7baasOcE49Yq4ugvOQfskP/YaSPAtnokY2TtgAedfI Swq3EnlFewLorIxSyzvRNy/V9+Uy9+c2gHXnwEWt0X4V97PeFaRdUMUJagsQqeCcVnXc 5iOe51eoTvYVU00HVNOoxUWYV6J/jpoteAzFnBCN7QB6q565aycwdyj+0L095w1UuDU7 W3tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gZQoDfI5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ij22-20020a170902ab5600b00186ab026646si2785548plb.394.2022.10.24.06.00.37; Mon, 24 Oct 2022 06:00:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gZQoDfI5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231724AbiJXM6j (ORCPT + 99 others); Mon, 24 Oct 2022 08:58:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234766AbiJXM5p (ORCPT ); Mon, 24 Oct 2022 08:57:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D39E97EFE; Mon, 24 Oct 2022 05:17:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1EB0B612DA; Mon, 24 Oct 2022 12:14:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E5E1C433D6; Mon, 24 Oct 2022 12:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613653; bh=urIQy0Zs8PsVFMCiFU6u2HlfNH0+WH5JcKKHZdSsssc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZQoDfI5mipgArkD345rVYo4NHfDH0Y0FFAopZ0Vy0d1C/4Ltk0ZNaqcZhozCVIrf 6eq+CT3Z3xNqL4yNYPNAOrHlEt1a3TIQSaP9cvUejSIxWP1PKrASEseWEIguleQY10 RpQxmRZR5NXA3icN6Pfb0zY1tHumUCtW3UXPJ+4o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, hongao , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 217/255] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:32:07 +0200 Message-Id: <20221024113010.287686901@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574014972505606?= X-GMAIL-MSGID: =?utf-8?q?1747574014972505606?= From: hongao [ Upstream commit 4bb71fce58f30df3f251118291d6b0187ce531e6 ] This got lost somewhere along the way, This fixes audio not working until set_property was called. Signed-off-by: hongao Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 0e1cacf73169..cf80da354ba1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1646,10 +1646,12 @@ amdgpu_connector_add(struct amdgpu_device *adev, adev->mode_info.dither_property, AMDGPU_FMT_DITHER_DISABLE); - if (amdgpu_audio != 0) + if (amdgpu_audio != 0) { drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); + amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; + } subpixel_order = SubPixelHorizontalRGB; connector->interlace_allowed = true; @@ -1771,6 +1773,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); + amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property, @@ -1824,6 +1827,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); + amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property, @@ -1874,6 +1878,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); + amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property,