From patchwork Sat Oct 22 07:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1139891wrr; Sat, 22 Oct 2022 03:23:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78GzZKV/OpsLmWYXaL/K3uONOyCY2E6nzdQqkK2rJiKqmyOSOQldYhppPP6+XZZZMVfsfX X-Received: by 2002:a17:906:8a48:b0:79e:da2d:c13f with SMTP id gx8-20020a1709068a4800b0079eda2dc13fmr4175551ejc.477.1666434227028; Sat, 22 Oct 2022 03:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666434227; cv=none; d=google.com; s=arc-20160816; b=TgWInA0xDmBbUZK5D6Q2KwSoTXG5D/bBCIF/hfpx1R841s41z4FmYvjkeAZfLSQ9qy BP0enI2wkwMf+SWEYtempMngdD97bXgxRhISPasKzk9BTG0BOXh3edKICFq5HohciHqb nsoQzaaTVoqbxL5kc5fbSt/YhMPiBhjY8+wLTjDAaf6d0cPZ3Pvj63oNjwige04n4I7y 2NG3I2DXpnYTHNNhgLpUXSk/dOWa+0+z95CfaNpCxNhlb4gMPzK/LnFkYySxElXBcgG6 7ZnQGagFuqjMAz7mWInnkpnE2K0gI87FgZK0LJERb4/PdLcvv41yYoLP1TrhxB2XGyUh vGFQ== 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=oWrM3ZblDF16QnG7wJFkpCv003izt5dSUqGwlTU/cxg=; b=QzHUkscWblO30UORo3bXOdGEQfuOn29VUhKM2LQHb1PSPXeA4mF7f1MJbSxWXfVnRQ rIbAIgyfAM+H5XTCwGPnn7ygXXUoR8/QJsVUXp/dQO8xu0nMpEllI+O+3uI0ZrR+BtXy MlKqk7v0pmpaojNoSknedcYVMTOTDoJ3DMttw/T97Ibf09VrCQNx0nvp5wtjxP4ZgIbs aX6OtbcaN9L98UaeNJK/E6jMOAGD51DB+rJHx7NOwZBRZZAXyAYcXDuy6WrHET8BR2N1 OoAlyB0lfDIcDTaFQt25W1fBz3v1AMwFcnle/DqSzTb25aRN7RuQ2dcaqCkRAliCZPZW 3f8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=twCAaLJb; 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 dm10-20020a170907948a00b0078de8d119d8si8237294ejc.853.2022.10.22.03.23.22; Sat, 22 Oct 2022 03:23:47 -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=twCAaLJb; 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 S230292AbiJVKPx (ORCPT + 99 others); Sat, 22 Oct 2022 06:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230036AbiJVKPV (ORCPT ); Sat, 22 Oct 2022 06:15:21 -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 2239422B10; Sat, 22 Oct 2022 02:32:28 -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 C4B85B82E03; Sat, 22 Oct 2022 08:04:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11A27C433C1; Sat, 22 Oct 2022 08:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425856; bh=zvWGShizebvrdEFUd9n0bZ6NDl0vKJL3PrigdSbA9rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=twCAaLJb85C9DNVsd9Np63lSQX4oG8X4TiHye6ESYXLdJL2GnKhZiMuuUz98yGFey LunVKieF+6yXnnkKHzwjKhVKVInRwLPgeP0+vgGwe+F3vy8f5teGDDxnDWPjgW/AWD dG5JgdT+0Fl4wqPYtAXbhKBH4W72RmBQEG8twmi8= 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.19 621/717] drm/amdgpu: fix initial connector audio value Date: Sat, 22 Oct 2022 09:28:20 +0200 Message-Id: <20221022072525.921840066@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747382936028550943?= X-GMAIL-MSGID: =?utf-8?q?1747382936028550943?= 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 b7933c2ce765..491d4846fc02 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1674,10 +1674,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; @@ -1799,6 +1801,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, @@ -1852,6 +1855,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, @@ -1902,6 +1906,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,