From nobody Wed Sep 17 01:30:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC4A0C3DA7A for ; Sun, 25 Dec 2022 19:03:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230100AbiLYTDY (ORCPT ); Sun, 25 Dec 2022 14:03:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbiLYTDW (ORCPT ); Sun, 25 Dec 2022 14:03:22 -0500 X-Greylist: delayed 470 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 25 Dec 2022 11:03:20 PST Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C30D710E4; Sun, 25 Dec 2022 11:03:20 -0800 (PST) Received: from iva2-656890eaceb5.qloud-c.yandex.net (iva2-656890eaceb5.qloud-c.yandex.net [IPv6:2a02:6b8:c0c:6902:0:640:6568:90ea]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 3FF3965D364D; Sun, 25 Dec 2022 21:55:28 +0300 (MSK) Received: by iva2-656890eaceb5.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id PtSiBVLYnSw1-ulrl9j4Y; Sun, 25 Dec 2022 21:55:27 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skif-web.ru; s=mail; t=1671994527; bh=iy4Od4RVHqYXYNH+uE4Skx6pnQbptFi0CvgCUrJzDyU=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=cce3df4d7VmoYXdrsOIu7YTdL0tcUTTQphxLJY1ocSMGEwsSMh2CInXYMUWe/9MCL TzR7Tk2hAl5E5r1FTH5AqPAGnAi14fwmXMINmfUguLnZtGS6vXbKNE/3OfYp0063QJ w8jiktL+fpKnBGq22vs25hjaaD91gaNSZBRPKAI4= Authentication-Results: iva2-656890eaceb5.qloud-c.yandex.net; dkim=pass header.i=@skif-web.ru From: Alexey Lukyanchuk To: tvrtko.ursulin@linux.intel.com Cc: Alexey Lukyanchuk , stable@vger.kernel.org, Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/i915: dell wyse 3040 shutdown fix Date: Sun, 25 Dec 2022 21:55:08 +0300 Message-Id: <20221225185507.149677-1-skif@skif-web.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221225184413.146916-1-skif@skif-web.ru> References: <20221225184413.146916-1-skif@skif-web.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dell wyse 3040 doesn't peform poweroff properly, but instead remains in=20 turned power on state. Additional mutex_lock and=20 intel_crtc_wait_for_next_vblank=20 feature 6.2 kernel resolve this trouble. cc: stable@vger.kernel.org original commit Link: https://patchwork.freedesktop.org/patch/508926/ fixes: fe0f1e3bfdfeb53e18f1206aea4f40b9bd1f291c Signed-off-by: Alexey Lukyanchuk --- I got some troubles with this device (dell wyse 3040) since kernel 5.11 started to use i915_driver_shutdown function. I found solution here: https://lore.kernel.org/dri-devel/Y1wd6ZJ8LdJpCfZL@intel.com/#r --- drivers/gpu/drm/i915/display/intel_audio.c | 37 +++++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i= 915/display/intel_audio.c index aacbc6da8..44344ecdf 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -336,6 +336,7 @@ static void g4x_audio_codec_disable(struct intel_encode= r *encoder, const struct drm_connector_state *old_conn_state) { struct drm_i915_private *dev_priv =3D to_i915(encoder->base.dev); + struct intel_crtc *crtc =3D to_intel_crtc(old_crtc_state->uapi.crtc); u32 eldv, tmp; =20 tmp =3D intel_de_read(dev_priv, G4X_AUD_VID_DID); @@ -348,6 +349,9 @@ static void g4x_audio_codec_disable(struct intel_encode= r *encoder, tmp =3D intel_de_read(dev_priv, G4X_AUD_CNTL_ST); tmp &=3D ~eldv; intel_de_write(dev_priv, G4X_AUD_CNTL_ST, tmp); + + intel_crtc_wait_for_next_vblank(crtc); + intel_crtc_wait_for_next_vblank(crtc); } =20 static void g4x_audio_codec_enable(struct intel_encoder *encoder, @@ -355,12 +359,15 @@ static void g4x_audio_codec_enable(struct intel_encod= er *encoder, const struct drm_connector_state *conn_state) { struct drm_i915_private *dev_priv =3D to_i915(encoder->base.dev); + struct intel_crtc *crtc =3D to_intel_crtc(crtc_state->uapi.crtc); struct drm_connector *connector =3D conn_state->connector; const u8 *eld =3D connector->eld; u32 eldv; u32 tmp; int len, i; =20 + intel_crtc_wait_for_next_vblank(crtc); + tmp =3D intel_de_read(dev_priv, G4X_AUD_VID_DID); if (tmp =3D=3D INTEL_AUDIO_DEVBLC || tmp =3D=3D INTEL_AUDIO_DEVCL) eldv =3D G4X_ELDV_DEVCL_DEVBLC; @@ -493,6 +500,7 @@ static void hsw_audio_codec_disable(struct intel_encode= r *encoder, const struct drm_connector_state *old_conn_state) { struct drm_i915_private *dev_priv =3D to_i915(encoder->base.dev); + struct intel_crtc *crtc =3D to_intel_crtc(old_crtc_state->uapi.crtc); enum transcoder cpu_transcoder =3D old_crtc_state->cpu_transcoder; u32 tmp; =20 @@ -508,6 +516,10 @@ static void hsw_audio_codec_disable(struct intel_encod= er *encoder, tmp |=3D AUD_CONFIG_N_VALUE_INDEX; intel_de_write(dev_priv, HSW_AUD_CFG(cpu_transcoder), tmp); =20 + + intel_crtc_wait_for_next_vblank(crtc); + intel_crtc_wait_for_next_vblank(crtc); + /* Invalidate ELD */ tmp =3D intel_de_read(dev_priv, HSW_AUD_PIN_ELD_CP_VLD); tmp &=3D ~AUDIO_ELD_VALID(cpu_transcoder); @@ -633,6 +645,7 @@ static void hsw_audio_codec_enable(struct intel_encoder= *encoder, const struct drm_connector_state *conn_state) { struct drm_i915_private *dev_priv =3D to_i915(encoder->base.dev); + struct intel_crtc *crtc =3D to_intel_crtc(crtc_state->uapi.crtc); struct drm_connector *connector =3D conn_state->connector; enum transcoder cpu_transcoder =3D crtc_state->cpu_transcoder; const u8 *eld =3D connector->eld; @@ -651,12 +664,7 @@ static void hsw_audio_codec_enable(struct intel_encode= r *encoder, tmp &=3D ~AUDIO_ELD_VALID(cpu_transcoder); intel_de_write(dev_priv, HSW_AUD_PIN_ELD_CP_VLD, tmp); =20 - /* - * FIXME: We're supposed to wait for vblank here, but we have vblanks - * disabled during the mode set. The proper fix would be to push the - * rest of the setup into a vblank work item, queued here, but the - * infrastructure is not there yet. - */ + intel_crtc_wait_for_next_vblank(crtc); =20 /* Reset ELD write address */ tmp =3D intel_de_read(dev_priv, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder)); @@ -705,6 +713,8 @@ static void ilk_audio_codec_disable(struct intel_encode= r *encoder, aud_cntrl_st2 =3D CPT_AUD_CNTRL_ST2; } =20 + mutex_lock(&dev_priv->display.audio.mutex); + /* Disable timestamps */ tmp =3D intel_de_read(dev_priv, aud_config); tmp &=3D ~AUD_CONFIG_N_VALUE_INDEX; @@ -721,6 +731,10 @@ static void ilk_audio_codec_disable(struct intel_encod= er *encoder, tmp =3D intel_de_read(dev_priv, aud_cntrl_st2); tmp &=3D ~eldv; intel_de_write(dev_priv, aud_cntrl_st2, tmp); + mutex_unlock(&dev_priv->display.audio.mutex); + + intel_crtc_wait_for_next_vblank(crtc); + intel_crtc_wait_for_next_vblank(crtc); } =20 static void ilk_audio_codec_enable(struct intel_encoder *encoder, @@ -740,12 +754,7 @@ static void ilk_audio_codec_enable(struct intel_encode= r *encoder, if (drm_WARN_ON(&dev_priv->drm, port =3D=3D PORT_A)) return; =20 - /* - * FIXME: We're supposed to wait for vblank here, but we have vblanks - * disabled during the mode set. The proper fix would be to push the - * rest of the setup into a vblank work item, queued here, but the - * infrastructure is not there yet. - */ + intel_crtc_wait_for_next_vblank(crtc); =20 if (HAS_PCH_IBX(dev_priv)) { hdmiw_hdmiedid =3D IBX_HDMIW_HDMIEDID(pipe); @@ -767,6 +776,8 @@ static void ilk_audio_codec_enable(struct intel_encoder= *encoder, =20 eldv =3D IBX_ELD_VALID(port); =20 + mutex_lock(&dev_priv->display.audio.mutex); + /* Invalidate ELD */ tmp =3D intel_de_read(dev_priv, aud_cntrl_st2); tmp &=3D ~eldv; @@ -798,6 +809,8 @@ static void ilk_audio_codec_enable(struct intel_encoder= *encoder, else tmp |=3D audio_config_hdmi_pixel_clock(crtc_state); intel_de_write(dev_priv, aud_config, tmp); + + mutex_unlock(&dev_priv->display.audio.mutex); } =20 /** --=20 2.25.1