From patchwork Mon Oct 24 11:33:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp622203wru; Mon, 24 Oct 2022 12:45:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4UEsbdxnL9bgW0zehAvPAir2jWAlbO0agQkFCWXL2ALsdraXpPNuyJxoXzrQDJmHoQxm/3 X-Received: by 2002:a17:907:d0f:b0:78d:a335:8368 with SMTP id gn15-20020a1709070d0f00b0078da3358368mr29784817ejc.260.1666640701093; Mon, 24 Oct 2022 12:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666640701; cv=none; d=google.com; s=arc-20160816; b=tymgZRfwPW1/10JFytBmQch7Wf0M0z+OIisHIiXP5a20VzaptG1pUYGH5leLszZ3wB DB28qHKja8JkaMGTg+NSOKfnoid9eigBw9yKlKKKRxHIIOCPha5gl+AaAiDi/18luX5J v+uGHrFRmHXH6ZeQfQIipc7xsiY1hBrn76h6fiQZtqmGUU2II/+dvmqS3B8JD+DZ3sKq uCV+jcI3qP4sYnwQya0ZX+QvJQn7wXyCKaKqN7lk1ofA6P+548LdnVDQjbBDcV/ApF0y 4ic4ykvJC1Ffl6RVjCL01sWRXv62yUuQs46B3BN51ABp/V3KLWJJHnByXaMVPQKOrBZk qhAQ== 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=D2U74MH/f3PeOcamVCo2aErLa7ob+QFC5LZA1nmoiBI=; b=QSGQCWtWp2tINTm+xWnArfavntdVMAwGXWtAP9IulpNjUjhxSspAGRfjkZT4jtEgBc WD1i8RSVaJG/QGB8oz+hEdOjbZkrjcH+8F7ALH3HQ0jxLu9vT2yqYUnFfp1T3iAGFOFI Ty0wuGB2LTqEKo+8q6OP01cAsSR+kzGghGWIHmjLcuVF7TXiPc0/wGODjfY2mqjwGGsD Pahc9rCtH2YAIXeUT/86n/HYomNs2skeWIAesDevNdWM4X7TG9gIXu1YwCeDSYL6rFbf e/MBNxmmrNRADW7MMrkEmENXpGLgIT6kPEj13J2osR/NainHWgUwBuJm1jf2ZBKur2fz kE3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O+HvxNsp; 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 ch5-20020a0564021bc500b00461c8f80e34si593348edb.53.2022.10.24.12.44.36; Mon, 24 Oct 2022 12:45:01 -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=O+HvxNsp; 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 S232830AbiJXTke (ORCPT + 99 others); Mon, 24 Oct 2022 15:40:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232381AbiJXTjo (ORCPT ); Mon, 24 Oct 2022 15:39:44 -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 906EED8EE0; Mon, 24 Oct 2022 11:10:19 -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 766D1B818B3; Mon, 24 Oct 2022 12:53:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2DCBC433C1; Mon, 24 Oct 2022 12:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615987; bh=yFuQDbmPwq9RUn5jwmUlLE30FAy6zEC5lrzi0/RXyRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O+HvxNspQsDMCEJfUcFeArycvqqUgfQUPUe4YjeSYpRLdvwPuOoeD7P1yLyK+sbe1 x77EAPlTSL2cRCBwZTKixwxC5OAg4zuJzZ2W25ab1i5W0hFE13g7nhwyYjO8U2MXYj 9SoyN7NAiMV13LsXVjxvL7M18QBkt8XSMgpjnv5Y= 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.15 457/530] drm/amdgpu: fix initial connector audio value Date: Mon, 24 Oct 2022 13:33:21 +0200 Message-Id: <20221024113105.746025776@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747599439832932534?= X-GMAIL-MSGID: =?utf-8?q?1747599439832932534?= 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 a09876bb7ec8..4b1d62ebf8dd 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,