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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8457DC46467 for ; Sun, 25 Dec 2022 18:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229540AbiLYSum (ORCPT ); Sun, 25 Dec 2022 13:50:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbiLYSul (ORCPT ); Sun, 25 Dec 2022 13:50:41 -0500 X-Greylist: delayed 376 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 25 Dec 2022 10:50:37 PST Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [IPv6:2a02:6b8:0:801:2::109]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B805F8F for ; Sun, 25 Dec 2022 10:50:37 -0800 (PST) Received: from myt6-265321db07ea.qloud-c.yandex.net (myt6-265321db07ea.qloud-c.yandex.net [IPv6:2a02:6b8:c12:2626:0:640:2653:21db]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 76DB56BD6705 for ; Sun, 25 Dec 2022 21:44:17 +0300 (MSK) Received: by myt6-265321db07ea.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id GiSr2aLYTa61-G13bQTT6; Sun, 25 Dec 2022 21:44:17 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skif-web.ru; s=mail; t=1671993857; bh=57RG2ny8VEgiTEiaXTSlnGZT9WHOmyYX4POl7/rqtcc=; h=Message-Id:Date:Cc:Subject:To:From; b=CABEqi6vHe2ENvChM8mmwwIEwjIRV+g/LRuq1fxKQ1gn7maLzz7ViQobb5n8hpwH9 MO9OaIMJgHmpqhk7Zk8IOCY8YwDYgm7jxc/h+tSyfQiZ2FjE6NfYAJrOJtrFEONFFf azc24ejmP8TKu+Tdh6aRfH3YTwj0I5X6bVZr52ZI= Authentication-Results: myt6-265321db07ea.qloud-c.yandex.net; dkim=pass header.i=@skif-web.ru From: Alexey Lukyanchuk To: nikita.shubin@maquefel.me Cc: Alexey Lukyanchuk , stable@vger.kernel.org Subject: [PATCH] drm/i915/: dell wyse 3040 shutdown fix Date: Sun, 25 Dec 2022 21:44:13 +0300 Message-Id: <20221225184413.146916-1-skif@skif-web.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org dell wyse 3040 doesn't peform poweroff properly, but instead remains in turned power on state. Additional mutex_lock and intel_crtc_wait_for_next_vblank in drivers/gpu/drm/i915/display/intel_crtc.c from feature 6.2 kernel resolve this trouble cc: stable@vger.kernel.org original commit Link: https://patchwork.freedesktop.org/patch/508926/ fixes: 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/i915/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_encoder *encoder, const struct drm_connector_state *old_conn_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); u32 eldv, tmp; tmp = intel_de_read(dev_priv, G4X_AUD_VID_DID); @@ -348,6 +349,9 @@ static void g4x_audio_codec_disable(struct intel_encoder *encoder, tmp = intel_de_read(dev_priv, G4X_AUD_CNTL_ST); tmp &= ~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); } static void g4x_audio_codec_enable(struct intel_encoder *encoder, @@ -355,12 +359,15 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_connector *connector = conn_state->connector; const u8 *eld = connector->eld; u32 eldv; u32 tmp; int len, i; + intel_crtc_wait_for_next_vblank(crtc); + tmp = intel_de_read(dev_priv, G4X_AUD_VID_DID); if (tmp == INTEL_AUDIO_DEVBLC || tmp == INTEL_AUDIO_DEVCL) eldv = G4X_ELDV_DEVCL_DEVBLC; @@ -493,6 +500,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder; u32 tmp; @@ -508,6 +516,10 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder, tmp |= AUD_CONFIG_N_VALUE_INDEX; intel_de_write(dev_priv, HSW_AUD_CFG(cpu_transcoder), tmp); + + intel_crtc_wait_for_next_vblank(crtc); + intel_crtc_wait_for_next_vblank(crtc); + /* Invalidate ELD */ tmp = intel_de_read(dev_priv, HSW_AUD_PIN_ELD_CP_VLD); tmp &= ~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 = to_i915(encoder->base.dev); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_connector *connector = conn_state->connector; enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; const u8 *eld = connector->eld; @@ -651,12 +664,7 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder, tmp &= ~AUDIO_ELD_VALID(cpu_transcoder); intel_de_write(dev_priv, HSW_AUD_PIN_ELD_CP_VLD, tmp); - /* - * 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); /* Reset ELD write address */ tmp = intel_de_read(dev_priv, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder)); @@ -705,6 +713,8 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, aud_cntrl_st2 = CPT_AUD_CNTRL_ST2; } + mutex_lock(&dev_priv->display.audio.mutex); + /* Disable timestamps */ tmp = intel_de_read(dev_priv, aud_config); tmp &= ~AUD_CONFIG_N_VALUE_INDEX; @@ -721,6 +731,10 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, tmp = intel_de_read(dev_priv, aud_cntrl_st2); tmp &= ~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); } static void ilk_audio_codec_enable(struct intel_encoder *encoder, @@ -740,12 +754,7 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, if (drm_WARN_ON(&dev_priv->drm, port == PORT_A)) return; - /* - * 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); if (HAS_PCH_IBX(dev_priv)) { hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe); @@ -767,6 +776,8 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, eldv = IBX_ELD_VALID(port); + mutex_lock(&dev_priv->display.audio.mutex); + /* Invalidate ELD */ tmp = intel_de_read(dev_priv, aud_cntrl_st2); tmp &= ~eldv; @@ -798,6 +809,8 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, else tmp |= audio_config_hdmi_pixel_clock(crtc_state); intel_de_write(dev_priv, aud_config, tmp); + + mutex_unlock(&dev_priv->display.audio.mutex); } /** -- 2.25.1