Message-ID: <Y7RVavxGE6GDLQXJ@intel.com>
Date:   Tue, 3 Jan 2023 11:18:50 -0500
From:   Rodrigo Vivi <rodrigo.vivi@...el.com>
To:     Alexey Lukyachuk <skif@...f-web.ru>,
        Ville Syrjälä <ville.syrjala@...el.com>
CC:     <tvrtko.ursulin@...ux.intel.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        <intel-gfx@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>,
        <stable@...r.kernel.org>, <dri-devel@...ts.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: dell wyse 3040 shutdown fix

On Tue, Jan 03, 2023 at 07:09:20PM +0300, Alexey Lukyachuk wrote:
> On Tue, 3 Jan 2023 07:46:40 -0500
> Rodrigo Vivi <rodrigo.vivi@...el.com> wrote:
> 
> > On Mon, Jan 02, 2023 at 04:56:49PM +0300, Alexey Lukyachuk wrote:
> > > On Tue, 27 Dec 2022 20:40:03 +0300
> > > Alexey Lukyachuk <skif@...f-web.ru> wrote:
> > > 
> > > > On Tue, 27 Dec 2022 11:39:25 -0500
> > > > Rodrigo Vivi <rodrigo.vivi@...el.com> wrote:
> > > > 
> > > > > On Sun, Dec 25, 2022 at 09:55:08PM +0300, Alexey Lukyanchuk wrote:
> > > > > > dell wyse 3040 doesn't peform poweroff properly, but instead remains in 
> > > > > > turned power on state.
> > > > > 
> > > > > okay, the motivation is explained in the commit msg..
> > > > > 
> > > > > > Additional mutex_lock and 
> > > > > > intel_crtc_wait_for_next_vblank 
> > > > > > feature 6.2 kernel resolve this trouble.
> > > > > 
> > > > > but this why is not very clear... seems that by magic it was found,
> > > > > without explaining what race we are really protecting here.
> > > > > 
> > > > > but even worse is:
> > > > > what about those many random vblank waits in the code? what's the
> > > > > reasoning?
> > > > > 
> > > > > > 
> > > > > > cc: stable@...r.kernel.org
> > > > > > original commit Link: https://patchwork.freedesktop.org/patch/508926/
> > > > > > fixes: fe0f1e3bfdfeb53e18f1206aea4f40b9bd1f291c
> > > > > > Signed-off-by: Alexey Lukyanchuk <skif@...f-web.ru>
> > > > > > ---
> > > > > > 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
> > > > > > 
> > > > 
> > > > 
> > > > I would like to say, that this solution was found in drm-tip repository:
> > > > link: git://anongit.freedesktop.org/drm-tip
> > > > I will quotate original commit message from Ville Syrjälä 
> > > > <ville.syrjala@...ux.intel.com>: "The spec tells us to do a bunch of 
> > > > vblank waits in the audio enable/disable sequences. Make it so."
> > > > So it's just a backport of accepted patch.
> > > > Which i wanna to propagate to stable versions
> > > 
> > > 
> > > Yes, I have checked 6.2-rc2 and everything work fine. I want to backport
> > > this commit to 6.0 and 6.1 because my company going to use these versions.
> > > Maybe it will be useful for 5.15, companies and vendors are passionate about
> > > LTS kernel ( I am edge to make special version of this patch for 5.15
> > > because hank 3 will be failed with it.).
> > > I am fully supportive with you that trouble is in timings/ locking changes.
> > > Early in detecting process I made some sleeps and it's help but not reliable.
> > > Regarding to your question about fdo gitlab, I went to do it. And in process
> > >  ("Before filing the bug, please try to reproduce your issue with the latest
> > >  kernel. Use the latest drm-tip branch") I found that trouble is resolves.
> > > Using bisect and tests, I got needed commit.
> > 
> > okay, so the only commit we need is this:
> > https://patchwork.freedesktop.org/patch/508926/
> > ?
> > 
> > and nothing else?
> 
> Yes, this patch is enough.
> 
> > 
> > If we want this to be included in older released active kernel versions we
> > need to follow this process:
> > 
> > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> > 
> > We cannot create a new patch like the origin of this thread.
> > 
> 
> May I ask you for a little additional explanation?
> I submitted my patch with adding <stable@...r.kernel.org> to CC.
> What else should I do?
> Maybe I should send new thread and send it only to <stable@...r.kernel.org> ?
> Should I make separate version for 5.15 lts?

Your patch is not the right approach. Please read the rules in the given link.

But also, even if you were backporting the original patch following the written
rules, it looks like Jani doesn't agree that it is a right fix, but just masking
the issue by coincidence apparently, if I understood him well.

Ville, thoughts on this issue and what patches to backport?

> 
> > > 
> > > Also I add log (by netconsole) from 5.15 kernel
> > > 
> > > [   60.031680] ------------[ cut here ]------------
> > > [   60.031709] i915 0000:00:02.0: drm_WARN_ON(!intel_irqs_enabled(dev_priv))
> > > [   60.031766] WARNING: CPU: 1 PID: 1964 at drivers/gpu/drm/i915/i915_irq.c:527 i915_enable_pipestat+0x1b9/0x230 [i915]
> > > [   60.032016] Modules linked in: snd_soc_sst_cht_bsw_rt5672 snd_hdmi_lpe_audio mei_hdcp intel_rapl_msr intel_powerclamp coretemp kvm_intel kvm punit_atom_debug crct10dif_pclmul ghash_clmulni_intel joydev input_leds aesni_intel crypto_simd cryptd snd_sof_acpi_intel_byt intel_cstate snd_sof_intel_ipc snd_sof_acpi snd_sof_intel_atom dell_wmi snd_sof_xtensa_dsp snd_sof dell_smbios ledtrig_audio dcdbas snd_intel_sst_acpi nls_iso8859_1 snd_soc_acpi_intel_match sparse_keymap snd_soc_acpi i915 efi_pstore snd_intel_sst_core wmi_bmof dell_wmi_descriptor snd_soc_sst_atom_hifi2_platform snd_soc_rt5670 snd_intel_dspcfg intel_chtdc_ti_pwrbtn snd_soc_rl6231 snd_intel_sdw_acpi ttm drm_kms_helper snd_soc_core cec snd_compress ac97_bus rc_core processor_thermal_device_pci_legacy snd_pcm_dmaengine i2c_algo_bit processor_thermal_device fb_sys_fops processor_thermal_rfim snd_pcm snd_seq_midi syscopyarea processor_thermal_mbox sysfillrect processor_thermal_rapl intel_rapl_common mei_txe intel_soc_dts_iosf
> > > [   60.032231]  snd_seq_midi_event mei intel_xhci_usb_role_switch sysimgblt snd_rawmidi snd_seq snd_seq_device snd_timer snd soundcore 8250_dw int3406_thermal mac_hid int3403_thermal int340x_thermal_zone int3400_thermal acpi_pad intel_int0002_vgpio acpi_thermal_rel sch_fq_codel ipmi_devintf ipmi_msghandler msr parport_pc ppdev lp parport drm ip_tables x_tables autofs4 overlay hid_logitech_hidpp hid_logitech_dj hid_generic usbhid hid netconsole mmc_block crc32_pclmul r8169 realtek lpc_ich sdhci_pci xhci_pci cqhci xhci_pci_renesas dw_dmac wmi sdhci_acpi video dw_dmac_core intel_soc_pmic_chtdc_ti sdhci
> > > [   60.032427] CPU: 1 PID: 1964 Comm: plymouthd Not tainted 5.15.0-57-generic #63~20.04.1-Ubuntu
> > > [   60.032440] Hardware name: Dell Inc. Wyse 3040 Thin Client/0G56C0, BIOS 1.2.4 01/18/2018
> > > [   60.032450] RIP: 0010:i915_enable_pipestat+0x1b9/0x230 [i915]
> > > [   60.032669] Code: 89 55 cc 44 89 5d d0 44 89 4d d4 e8 c1 15 ae d8 48 8b 55 c0 48 c7 c1 a8 72 b5 c0 48 c7 c7 54 b5 b8 c0 48 89 c6 e8 0e 21 f5 d8 <0f> 0b 44 8b 55 cc 44 8b 5d d0 44 8b 4d d4 e9 9d fe ff ff 4c 89 f6
> > > [   60.032682] RSP: 0018:ffffaaa50070b878 EFLAGS: 00010086
> > > [   60.032694] RAX: 0000000000000000 RBX: ffff980ec8080000 RCX: ffffffff9ab7a748
> > > [   60.032703] RDX: 00000000ffffdfff RSI: ffffaaa50070b6b8 RDI: 0000000000000001
> > > [   60.032713] RBP: ffffaaa50070b8c0 R08: 0000000000000003 R09: 0000000000000001
> > > [   60.032721] R10: ffffffff9b21f3b6 R11: 000000009b21f38a R12: 0000000000000004
> > > [   60.032730] R13: 0000000000000000 R14: 0000000000000000 R15: ffff980ec8080000
> > > [   60.032740] FS:  00007f0967eec740(0000) GS:ffff980f34280000(0000) knlGS:0000000000000000
> > > [   60.032752] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > > [   60.032762] CR2: 00007f7f5f21eaa4 CR3: 000000000a34a000 CR4: 00000000001006e0
> > > [   60.032772] Call Trace:
> > > [   60.032781]  <TASK>
> > > [   60.032793]  ? drm_crtc_vblank_helper_get_vblank_timestamp_internal+0xe0/0x370 [drm]
> > > [   60.032899]  i965_enable_vblank+0x3d/0x60 [i915]
> > > [   60.033139]  drm_vblank_enable+0xfd/0x1a0 [drm]
> > > [   60.033240]  drm_vblank_get+0xaf/0x100 [drm]
> > > [   60.033335]  drm_crtc_vblank_get+0x17/0x20 [drm]
> > > [   60.033426]  intel_pipe_update_start+0x128/0x2f0 [i915]
> > > [   60.033689]  ? wait_woken+0x60/0x60
> > > [   60.033710]  intel_update_crtc+0xd2/0x420 [i915]
> > > [   60.033969]  intel_commit_modeset_enables+0x74/0xa0 [i915]
> > > [   60.034228]  intel_atomic_commit_tail+0x587/0x14e0 [i915]
> > > [   60.034488]  intel_atomic_commit+0x3a6/0x410 [i915]
> > > [   60.034746]  drm_atomic_commit+0x4a/0x60 [drm]
> > > [   60.034849]  drm_atomic_helper_set_config+0x80/0xc0 [drm_kms_helper]
> > > [   60.034921]  drm_mode_setcrtc+0x1ff/0x7d0 [drm]
> > > [   60.035011]  ? drm_mode_getcrtc+0x1e0/0x1e0 [drm]
> > > [   60.035098]  drm_ioctl_kernel+0xb2/0x100 [drm]
> > > [   60.035182]  drm_ioctl+0x275/0x4a0 [drm]
> > > [   60.035265]  ? drm_mode_getcrtc+0x1e0/0x1e0 [drm]
> > > [   60.035354]  __x64_sys_ioctl+0x95/0xd0
> > > [   60.035372]  do_syscall_64+0x5c/0xc0
> > > [   60.035388]  ? exit_to_user_mode_prepare+0x3d/0x1c0
> > > [   60.035404]  ? syscall_exit_to_user_mode+0x27/0x50
> > > [   60.035418]  ? do_syscall_64+0x69/0xc0
> > > [   60.035431]  ? syscall_exit_to_user_mode+0x27/0x50
> > > [   60.035445]  ? do_syscall_64+0x69/0xc0
> > > [   60.035459]  ? syscall_exit_to_user_mode+0x27/0x50
> > > [   60.035474]  ? do_syscall_64+0x69/0xc0
> > > [   60.035487]  ? do_syscall_64+0x69/0xc0
> > > [   60.035501]  ? do_syscall_64+0x69/0xc0
> > > [   60.035514]  entry_SYSCALL_64_after_hwframe+0x61/0xcb
> > > [   60.035528] RIP: 0033:0x7f09681aa3ab
> > > [   60.035542] Code: 0f 1e fa 48 8b 05 e5 7a 0d 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d b5 7a 0d 00 f7 d8 64 89 01 48
> > > [   60.035554] RSP: 002b:00007fff40931638 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> > > [   60.035567] RAX: ffffffffffffffda RBX: 00007fff40931670 RCX: 00007f09681aa3ab
> > > [   60.035576] RDX: 00007fff40931670 RSI: 00000000c06864a2 RDI: 0000000000000009
> > > [   60.035584] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 00005560dd410090
> > > [   60.035592] R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000007f
> > > [   60.035601] R13: 0000000000000009 R14: 00005560dd40ffe0 R15: 00005560dd410020
> > > [   60.035613]  </TASK>
> > > [   60.035622] ---[ end trace a700e85625cc752d ]---
> 

Powered by blists - more mailing lists