ALSA: hda: intel: Release i915 power also when delayed probe fails
PATCH v2 1/2 ALSA: hda: intel: Release i915 power also when delayed probe fails
Commit fbaccb1b19c7 ("ALSA: hda: intel: Don't free card in the probe work") stopped freeing the card from azx_probe_work() when the delayed probe fails, and only disconnects it, leaving the free to azx_remove(). This avoids the double free, but the resources that were released by the card free via azx_free() are now kept until the PCI device is unbound. In particular the display power reference stay held, blocking runtime suspend for i915/xe.
Release the display power in the azx_probe_continue() work in all cases. This power reference is only taken for the purpose of the display codec probe. If the display codec probe was successful, it will have taken its own reference. In case of systems with the HDA controller on GPU side (hda->need_i915_power), functionality is same as before - we have to keep power.
---
Notes for V2:
- Reduced the scope of change based sashikobot comments. In this version, only drop the display power reference taken for probing and do the change in in probe_continue(). Leave all the rest to azx_remove().
- Add a second patch to remove unused code left after commit fbaccb1b19c7
sound/hda/controllers/intel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/hda/controllers/intel.c +3 -2
@@ -2452,6 +2452,9 @@ static int azx_probe_continue(struct azx *chip, bool free_on_error) } out_free: +if (!hda->need_i915_power) +display_power (chip, false); +if (err <0 ) {if (hda->vga_switcheroo_registered)dev_warn (&pci->dev,"GPU sound probed, but not operational: please add a quirk to driver_denylist\n" );
@@ -2462,8 +2465,6 @@ static int azx_probe_continue(struct azx *chip, bool free_on_error)return err; } -if (!hda->need_i915_power) -display_power (chip, false);complete_all (&hda->probe_wait);to_hda_bus (bus)->bus_probing =0 ; hda->probe_retry =0 ;
base-commit: 1afd6b7547b2ff0824e91fdf269bbd089f767a5d
Signature · 1 line
2.43.0
PATCH v2 2/2 ALSA: hda: intel: Remove unused free_on_error from azx_probe_continue()
Commit fbaccb1b19c7 ("ALSA: hda: intel: Don't free card in the probe work") changed azx_probe_work() to pass false for the free_on_error argument of azx_probe_continue(), and left freeing the card to azx_remove(). That was the only caller that passed true, so the argument is now always false and the code freeing the card on error is dead.
Remove the argument and the dead code.
No functional change.
--- sound/hda/controllers/intel.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
sound/hda/controllers/intel.c +4 -8
@@ -1184,7 +1184,7 @@ static const struct dev_pm_ops azx_pm = { }; -static int azx_probe_continue (struct azx *chip,bool free_on_error); +static int azx_probe_continue (struct azx *chip);#ifdef SUPPORT_VGA_SWITCHEROO static struct pci_dev *get_bound_vga (struct pci_dev *pci);
@@ -1211,7 +1211,7 @@ static void azx_vs_set_state(struct pci_dev *pci,if (!disabled) {dev_info (chip->card->dev,"Start delayed initialization\n" ); -if (azx_probe_continue (chip, false) <0 ) { +if (azx_probe_continue (chip) <0 ) { hda->init_failed =1 ;dev_err (chip->card->dev,"initialization error\n" ); }
@@ -1739,7 +1739,7 @@ static void azx_probe_work(struct work_struct *work) { struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work); -if (azx_probe_continue (&hda->chip, false) <0 ) { +if (azx_probe_continue (&hda->chip) <0 ) { hda->init_failed =1 ;complete_all (&hda->probe_wait);snd_card_disconnect (hda->chip.card);
@@ -2362,7 +2362,7 @@ static const unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = { [AZX_DRIVER_TERA] = 1, }; -static int azx_probe_continue (struct azx *chip,bool free_on_error) +static int azx_probe_continue (struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip);struct hdac_bus *bus =azx_bus (chip);
@@ -2458,10 +2458,6 @@ static int azx_probe_continue(struct azx *chip, bool free_on_error)if (err <0 ) {if (hda->vga_switcheroo_registered)dev_warn (&pci->dev,"GPU sound probed, but not operational: please add a quirk to driver_denylist\n" ); -if (free_on_error) { -pci_set_drvdata (pci,NULL ); -snd_card_free (chip->card); - }return err; }
Signature · 1 line
2.43.0
Patchwork
CI✓ i915.CI.BAT: success for series starting with [v2,1/2] ALSA: hda: intel: Release i915 power also when delayed probe fails
In reply to Kai Vehmanen== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] ALSA: hda: intel: Release i915 power also when delayed probe fails
URL : https://patchwork.freedesktop.org/series/179218/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_19574 -> Patchwork_179218v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/index.html
Participating hosts (39 -> 39)
------------------------------
Additional (1): bat-adls-6
Missing (1): bat-dg2-13
Known issues
------------
Here are the changes found in Patchwork_179218v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adls-6: NOTRUN -> [SKIP][1] ([i915#4613]) +3 other tests skip
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@gem_tiled_pread_basic@basic:
- bat-adls-6: NOTRUN -> [SKIP][2] ([i915#15656])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@intel_hwmon@hwmon-read:
- bat-adls-6: NOTRUN -> [SKIP][3] ([i915#7707]) +1 other test skip
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adls-6: NOTRUN -> [SKIP][4] ([i915#4103]) +1 other test skip
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_dsc@dsc-basic:
- bat-adls-6: NOTRUN -> [SKIP][5] ([i915#16361])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-adls-6: NOTRUN -> [SKIP][6] ([i915#17452])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_pm_backlight@basic-brightness:
- bat-adls-6: NOTRUN -> [SKIP][7] ([i915#5354])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_psr@psr-primary-mmap-gtt:
- bat-adls-6: NOTRUN -> [SKIP][8] ([i915#1072] / [i915#9732]) +3 other tests skip
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adls-6: NOTRUN -> [SKIP][9] ([i915#3555])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- bat-adls-6: NOTRUN -> [SKIP][10] ([i915#17448] / [i915#3291]) +2 other tests skip
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-adls-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- bat-arls-6: [SKIP][11] ([i915#17751]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_19574/bat-arls-6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-arls-6/igt@[email protected]
- bat-arls-5: [SKIP][13] ([i915#17751]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_19574/bat-arls-5/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-arls-5/igt@[email protected]
- bat-jsl-5: [FAIL][15] ([i915#17751]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_19574/bat-jsl-5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/bat-jsl-5/igt@[email protected]
[i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
[i915#15656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15656
[i915#16361]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16361
[i915#17448]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17448
[i915#17452]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17452
[i915#17751]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17751
[i915#3291]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3291
[i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
[i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
[i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
[i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
Build changes
-------------
* Linux: CI_DRM_19574 -> Patchwork_179218v1
CI-20190529: 20190529
CI_DRM_19574: 90b50d97b3af2f55a75116f1ec76e0cf62914418 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_9200: 9200
Patchwork_179218v1: 90b50d97b3af2f55a75116f1ec76e0cf62914418 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179218v1/index.html