From patchwork Mon Oct 24 11:32:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp618515wru; Mon, 24 Oct 2022 12:34:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6PrOMUBzXD+VuQlTkyytC3Z0U6/lzkVtBGaz0yYENGaKjY3yfYPFpJJLt1QgAQSVL7oPZL X-Received: by 2002:a17:90a:fab:b0:213:1431:86d0 with SMTP id 40-20020a17090a0fab00b00213143186d0mr6952567pjz.154.1666640049025; Mon, 24 Oct 2022 12:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666640049; cv=none; d=google.com; s=arc-20160816; b=J1/5Od/3vmIVt4IlAF+HH4TWvQ5BtzpgN738WuuaAj4ILyRLpZPRtZxRfEH4ZeGODC icX0iMwCqmo31UzG3Ov5r3Yxd7rOU/Z5P/rbASRzR07N1aC6fy8jxGGE9t4sJSZKSofL KNOP0GpgMvMOyeM8AQHi+/OAub3a4o3tuTNzef3kweIizcgQ5aHRvaPYJfx64Xsx21X9 my3sujx9d/MLOBFhoh6j7wcLTdf+CB53E4Wr0TOHArhfWoRTov/9zARLgmPAGkB+7cnb +OlWNnZY2kah9KXIN99ggKOBlqsgIV/+hlABUYBnlHPsWHiQYnUwDX+OgW4IKf5rYF/7 pAPg== 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=ToENxg+GaELwG/rA5lKC/sdWSh1znNdo94CCQ0qXcHQ=; b=LxSgovaFx7EU8MaGKP51XOWDS1YAyLd4BB9BVzxk+8uIoNbUhfRfUYVvRBbj+CWwPN ck8wkLJ3HXTWl00kj1dQxBNJxqkoTnC8dSf9xokIAdWIsTi2x155cPy0J7NxKabilVFv s7XXPl6PH2ABbWauH2d3G9QzD6YsWbOujr88BwB9fIrLptMyIMxz0yxAF9umzaPOfD9P /SAXnA0Q101ssg5xAPjNxkZyAh4L0XYI+1LnQPyKPO8SLhluLbLs06hTD3ORfnctKMT4 OBg6wc9PsAKcTdCOrNZJ16C7VpAihHZRIZtOquSeOgYrmHe7lbsfxQFi0d359GkomF5p NAjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0ijuYElF; 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 s64-20020a632c43000000b0046b1a7c6679si370433pgs.414.2022.10.24.12.33.56; Mon, 24 Oct 2022 12:34:09 -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=0ijuYElF; 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 S232939AbiJXTdL (ORCPT + 99 others); Mon, 24 Oct 2022 15:33:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbiJXTcu (ORCPT ); Mon, 24 Oct 2022 15:32:50 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01601D73E5; Mon, 24 Oct 2022 11:03:10 -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 ams.source.kernel.org (Postfix) with ESMTPS id 54178B816AF; Mon, 24 Oct 2022 12:30:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EFBCC433D7; Mon, 24 Oct 2022 12:30:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614639; bh=Rb9Cpi+DHBOf+LtpoHqa9AhLp5UsfP7z+yEnGXy9dsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0ijuYElF0bGi62adrIGP93RBmdI20x126a0i4nsXwOdJh7jsZLoNhqrhUkU1mK4n6 wL6DX0UHaG4dhmz0zqyDuwVV++Boif2cjMcVJdokRL6/3yb38pzh43E9w2++ngwqTJ VSw1qVzksC/bhUoVpFogguVz+fVIxtE29fDwKnAc= 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.10 337/390] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:32:14 +0200 Message-Id: <20221024113037.353781579@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747598756142125741?= X-GMAIL-MSGID: =?utf-8?q?1747598756142125741?= 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 df1f9b88a53f..98d3661336a4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1671,10 +1671,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; @@ -1796,6 +1798,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, @@ -1849,6 +1852,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, @@ -1899,6 +1903,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,