From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8949C2D0BF for ; Tue, 10 Dec 2019 21:33:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4137214AF for ; Tue, 10 Dec 2019 21:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013615; bh=DcAG3UEGPSU/Aki3OicxSiWKF24ec1/cRusq/ry4WOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r63E+mAgUQWvR6BRmfHEBdOw222GDmfS6e8e7Gd/bdjrMMuStgbCFxm81eE/sB0CK fZSbF6/eZe/3xuVz7s0n/9qYA04tneAIEwjepBzAN6DqFrm9edX+W9uXT/bs9SEW18 OUJTHUjMlMJZd8/rSbWMga2Qp4jMmLvGbW+ctlCI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729765AbfLJVde (ORCPT ); Tue, 10 Dec 2019 16:33:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:37822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729689AbfLJVd3 (ORCPT ); Tue, 10 Dec 2019 16:33:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5179B2464B; Tue, 10 Dec 2019 21:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013609; bh=DcAG3UEGPSU/Aki3OicxSiWKF24ec1/cRusq/ry4WOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Xhz4SFybbKwDmk+J49k3zXXVyR7FvwB+izLfpte/SErMtg0gOk9WXQ25ORrajLb1 ylVIt6/SDcQX01CDlU1rHZzPZURQ/+J+zvLd5toZrL40jBmjom+/xPL/MrmyGwHM46 /RJ4hiAFzosFcEDuHLwLMYiv4F8ZL3EyHXEYmtgw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Kurtz , Cheng-Yi Chiang , Yakir Yang , Neil Armstrong , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 055/177] drm/bridge: dw-hdmi: Restore audio when setting a mode Date: Tue, 10 Dec 2019 16:30:19 -0500 Message-Id: <20191210213221.11921-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Kurtz [ Upstream commit fadfee3f9d8f114435a8a3e9f83a227600d89de7 ] When setting a new display mode, dw_hdmi_setup() calls dw_hdmi_enable_video_path(), which disables all hdmi clocks, including the audio clock. We should only (re-)enable the audio clock if audio was already enabled when setting the new mode. Without this patch, on RK3288, there will be HDMI audio on some monitors if i2s was played to headphone when the monitor was plugged. ACER H277HU and ASUS PB278 are two of the monitors showing this issue. Signed-off-by: Cheng-Yi Chiang Signed-off-by: Daniel Kurtz Signed-off-by: Yakir Yang Reviewed-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20191008102145.55134-1-cychiang@chromium.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index fb396d550275c..2a0a1654d3ce5 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1757,7 +1757,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) /* HDMI Initialization Step E - Configure audio */ hdmi_clk_regenerator_update_pixel_clock(hdmi); - hdmi_enable_audio_clk(hdmi, true); + hdmi_enable_audio_clk(hdmi, hdmi->audio_enable); } /* not for DVI mode */ -- 2.20.1