From patchwork Mon Oct 24 11:31:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp622468wru; Mon, 24 Oct 2022 12:45:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64tILTC96Axd8qNk7RZqXnYJClJX4nqeRCs+FevQ8l97P5EM4UcpC/HIf9P9szPF0R5nVX X-Received: by 2002:a17:906:7055:b0:78b:9148:6b41 with SMTP id r21-20020a170906705500b0078b91486b41mr28155160ejj.629.1666640733913; Mon, 24 Oct 2022 12:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666640733; cv=none; d=google.com; s=arc-20160816; b=mp81jfmbac6TVCjKRXZJIiJpXdtFo+CcTJMeBEm1wPC0IYI6q5WHb4p+IXIgaLcFOn KcqrMf2Wt7uuZATqo6m7yG59ZeZx2JPu8A9ALRxkX2r8nCR0+1GF0AqJHVXmqAckH3DG wT7PperA/uqT30x0W3QPNBSRw1oEp11hCOO2icW8qmBWv5/SsqCX+Pq8wdvls+fd6XfA gRkCrSk7O4a9LTZNzBB8zQYSmz8qBtgzdgbab1Itpl0QmUTqJu2pQNNou2VGogbkqNsx P8+oS+MKw45Uq7FqHzmO4YriqRMkZZuRJAhWwGaj4U9AIp3o1W25O8VLanZSZBS2gsqe YWPQ== 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=pduzL4e4PG7j9Ol/k/QG8XHoujfods5QybXQ7hCA72Q=; b=Odo3Zf1uB7EWDWE/i+0nPJczVqeJPHyq+fAWrDW8EPDu2B0HVisyVzrrbNTXXA7Ot1 UHrd4fGcT75Zv1+sbdSMDIJlFXvZy0Vuac7daxTQZ5o6LQUINCGcmXXoWlOCH6Im2EtF 2GpV9suzKDb+qwCTaMefRUqww/Z1OyoRpFGG0T23XRcNKnVFnQKgjA72f2N4jL71e8cI yjWCAKOOYm6YhaesTDmPXp7xHMrjGto2qvKH9tx7xEI0PhkflwQqMZ0RFNkyk31MYTFM ps79FQKTSUJn8VrcZdKbzWW9PzIwfuLwZIJS0Psr+7zVEMsNB2mTW9I1Tm7UWSoFWY3Q pVUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VOHOzTZl; 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 oz30-20020a1709077d9e00b0077fd5b45e18si630676ejc.929.2022.10.24.12.45.07; Mon, 24 Oct 2022 12:45:33 -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=VOHOzTZl; 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 S233438AbiJXTmf (ORCPT + 99 others); Mon, 24 Oct 2022 15:42:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233437AbiJXTl1 (ORCPT ); Mon, 24 Oct 2022 15:41:27 -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 3C867262DE5; Mon, 24 Oct 2022 11:11: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 ams.source.kernel.org (Postfix) with ESMTPS id 1EF33B811B3; Mon, 24 Oct 2022 11:53:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71892C433C1; Mon, 24 Oct 2022 11:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612412; bh=1f/IIM22KhSPq/tEzKR9rXQnG4Nt9yGvBNVX09/3mEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOHOzTZl/Uk0SwQEqXTjDq/MflK9nOWfAtgDJlgHKSv3xUGfJq3KD5l8FYVTUNm1G invv/FGAYpUf+v+46g512LH8tWur6TXyEGNVk5JOByzqBqO4S+U8U6aCAjz0R2LZnU 9I+dc7e5TcyO7AVykywRTFTO8uwy3waqr3/PIDtA= 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.14 188/210] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:31:45 +0200 Message-Id: <20221024113003.060115165@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747599474139452369?= X-GMAIL-MSGID: =?utf-8?q?1747599474139452369?= 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 0894bb98dc51..be3a384cc1cf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1678,10 +1678,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; @@ -1786,6 +1788,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, @@ -1834,6 +1837,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, @@ -1879,6 +1883,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,