From patchwork Mon Oct 24 11:31:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8812 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp431034wru; Mon, 24 Oct 2022 05:42:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77EGTKm1lq63Bec+WOVerUQI+fcvS69LVzmPZ6To322oAC671UCLm4cKpQAp70v70/24+B X-Received: by 2002:a17:907:7b93:b0:770:1d4f:4de9 with SMTP id ne19-20020a1709077b9300b007701d4f4de9mr27795336ejc.201.1666615368290; Mon, 24 Oct 2022 05:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615368; cv=none; d=google.com; s=arc-20160816; b=dOBJHqTNFQEod1GXUI3GycOxQpZLA/6dINDzgNc8HxF+HseSSU69NOYzyPveJtJnGo ZIRSuVVsGKJWfuwaMaUA1/TOCRxbjE7PCBN2yXUrstrtJx6j11+A+a3Z6uacbfhmCopE eXD6Nbz9r74T4K/g526k3Vf8yUXjxy2d4AR2ZOpbxl6XelD9gaoTuNdhXbrPWkJ7guc2 6uB8KoSaSpDGgEoFCthlPrGIg2fzPURTcgig0RPPg5lpgw7gm0mxwK4fSi1mJQz/DLyu BsU5LZaN+ffqYjm07T5l9expmS2IfZ10Wp5FnjAbJGhCgtnJlNQVVn1/6Y82FJ+DLgk0 9v3w== 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=5hcUie6IpDgs1+Z+EmrIpS2ADxskD2wy08G4BqMWU/k=; b=zI5Ya//gFVEVWTUOUcswCgWX93pKIktBRcIUZ4teJxXQsNAbdF6QCfp2x6HJqBk3Od CHpFPJgIo/1lrS4FFXwpFsCFb06tqo7heQYP9rRYgXCh3ECaI9a9hsBmQ/SGq4yJBltu dT+n3YZE8haMPioSvX+ngAtqTIFObHY9Rncz0UjQWgtjuo1YVikilpqgV+GFVuiq21Cy QMsngMFNozDLn1NO60ONvCsLteQN5ZBAZ4KwSjkcnPJdX9uouii8zqNFPZjWX9TOEM2D OSd9ULHdCg+Y75yk/uWoLee0RtsRE7rknBn0AoIzDs6m11uBDo2KmSwV0wDFAlE4H3uz DN5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Y3K8aD3r; 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 v22-20020a056402349600b0045cea9cf231si32101486edc.566.2022.10.24.05.42.20; Mon, 24 Oct 2022 05:42:48 -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=Y3K8aD3r; 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 S234556AbiJXMf1 (ORCPT + 99 others); Mon, 24 Oct 2022 08:35:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234251AbiJXM3u (ORCPT ); Mon, 24 Oct 2022 08:29:50 -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 911192314F; Mon, 24 Oct 2022 05:03:59 -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 B6E9D612CC; Mon, 24 Oct 2022 12:03:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7FC6C433C1; Mon, 24 Oct 2022 12:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612996; bh=x64p9PIf/71AI9EqI80e9YSybdV7Rzg21I92kH5YS6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y3K8aD3rAFeS9iqm7yYvfB13Ymx6SccH6JEWbjj3smToe7/JGlyBO6SjUdgk8/vUU uWckbM3kPfqIF6aDQIn1g+9Qlm3Fgb/r0R3WxAWZzxWdyQjcINyeEdrwkOULzYD6D/ RVxYVLCZbnrg0MesYlQzcXjpgl1MkgkAIo84GbbY= 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 4.19 199/229] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:31:58 +0200 Message-Id: <20221024113005.574907046@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572876807902531?= X-GMAIL-MSGID: =?utf-8?q?1747572876807902531?= 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 3e4305c3c983..86ceefb8b8fb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1638,10 +1638,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; @@ -1746,6 +1748,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, @@ -1794,6 +1797,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, @@ -1839,6 +1843,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,