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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 1EADCC2D0CE for ; Sun, 29 Dec 2019 18:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E24CF206A4 for ; Sun, 29 Dec 2019 18:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643434; bh=J46BA9LfusTNVzdmQ4WIT/pDrOIyvsFauuDspAxcfRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HbS0zC5OeUaNzxkEmdYtFXLkl/JmKl4pluGSn3AW11t4wgG3GhP9o0QhnqCVtn3pL 0IGhTti2DItbAbBsgz9o2C7upqiI95N1kUvjxFPH0/itXzmIP+sjFvMZTLdscgg3+t QD/ItYFK7CAa+AqxktPwifJqonY52VpoAR02foQs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727150AbfL2RXV (ORCPT ); Sun, 29 Dec 2019 12:23:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:40816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727516AbfL2RXU (ORCPT ); Sun, 29 Dec 2019 12:23:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79D97208E4; Sun, 29 Dec 2019 17:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640199; bh=J46BA9LfusTNVzdmQ4WIT/pDrOIyvsFauuDspAxcfRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y8LVBUpjJSq8yIfQhRCPqI9cwY7z8bE0W0lXIZlXIUh0aO3DiT3UJzHeYaACHwaZc 20ut1LTOlpdOgAJJlRshoHuXIVKyCGtGWiU2tF+/7XywAggJCq5ay4f+ySXCsD9zsS gVn4+6HyGI5ueiHK41Wdo7z4j8qKS8DhVHCZKELA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cheng-Yi Chiang , Daniel Kurtz , Yakir Yang , Neil Armstrong , Sasha Levin Subject: [PATCH 4.14 059/161] drm/bridge: dw-hdmi: Restore audio when setting a mode Date: Sun, 29 Dec 2019 18:18:27 +0100 Message-Id: <20191229162417.025260067@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 0febaafb8d89..cc1094f90125 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1743,7 +1743,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