From patchwork Mon Oct 24 11:31:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp405266wru; Mon, 24 Oct 2022 04:56:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ioo5CZ0j4wJvf83SyEhWOu6ZHk02Uw61hnIFJhx/N3ZIwMHCDlAptRK7qjz8PLWozehXj X-Received: by 2002:a05:6a02:207:b0:46f:1a92:9474 with SMTP id bh7-20020a056a02020700b0046f1a929474mr1581388pgb.344.1666612601973; Mon, 24 Oct 2022 04:56:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612601; cv=none; d=google.com; s=arc-20160816; b=aoqHDcNKXFF7jW1vkzjaXoVF5+uXlKUh1Ycz+NlsFYMzhi9/t1DFL0Jp8SujXcUBJV UbDaH1ZVEQXg13cgFwTzmdwMYinBYM9C89l46/stQ05ERbEhn0yGXWbkb2gTmYAvmhZl lOZ2hK72ZGR5i8S0GgvGClWrU13WUq4MDJy9nE6o7MgRrHf3KEEexkKg9T7J9f7M9yYI r2nXxnQg4+arsk5EgDnL291Z5AQKRBkZkqa8rycKn8cmvuXbR5j8gth2kXPTaHZ9/78j wr7lNwtuAIjZ+1Xx0a+jxLVSCNR4MIxqxdBh+ETGK131tK1Lw2tAwPwot46hJzCG8iuS 9Ckg== 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=dam38o7rU473gQuap5rU51Rbv2u0ljSDJ68MlizsPAk=; b=ytQtlKAmrOnBLVoFMQOGEQl/iO6LFLnX/wWK6DaxI2is7woLpjopJjfu2mvQQ93iWS FwVbVeuj3k/ccryAHg4qMiRx8dfXDTLUN/eXRn+jgg/vkuf1Clw2ikUmexN9L5WQJUus kPfF5eohNwasbVeowg6d3b7aCLDdpo25JPEExSBDJW6BNPowu2tX88OUXNpzzLrNmzbt +nw0wj+K0Y5Bjs6wLhlHgC/yuZYSSq1XZDzXsm4hqPPhqvsq93DFzOfythF+MdoWWznU JwIcb22FazkbeWLpctHv2bUddd9Ccrsuy8g/SJfrK/dG1peNRE2aNHGbNDZ48NdqIVo3 QdZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZL6l034V; 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 e3-20020a17090301c300b0018537cc29f9si6599861plh.15.2022.10.24.04.56.27; Mon, 24 Oct 2022 04:56:41 -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=ZL6l034V; 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 S232258AbiJXL4J (ORCPT + 99 others); Mon, 24 Oct 2022 07:56:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232226AbiJXLyJ (ORCPT ); Mon, 24 Oct 2022 07:54:09 -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 987C9399FE; Mon, 24 Oct 2022 04:45:23 -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 6839AB8117D; Mon, 24 Oct 2022 11:44:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C240AC433D7; Mon, 24 Oct 2022 11:44:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611865; bh=91Cs5LiCxsUxrtJkM/+UxL67qhxRWjuYTje3L63IUJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZL6l034V3x1b5N75G7/cLMlV3DrkQ/7aAStgNmxvnqAyYrxlophMxTB86X8CGPV01 QieW48uLgIImLlIcJ7y+Uu1Bgrla3JSpf2B4tJe+iO+LOwDIEjH4BWXvv3S5JGN99W xpTY1Ht3HU2F92WNdONjPNuRr9hDzlvfQXXF18EI= 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.9 140/159] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:31:34 +0200 Message-Id: <20221024112954.576372053@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569975909824077?= X-GMAIL-MSGID: =?utf-8?q?1747569975909824077?= 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 7264169d5f2a..7c266dbb88a1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1760,10 +1760,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; @@ -1868,6 +1870,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, @@ -1916,6 +1919,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, @@ -1961,6 +1965,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,