diff --git a/linux-tkg-patches/6.0/0012-misc-additions.patch b/linux-tkg-patches/6.0/0012-misc-additions.patch index 26c875f..a7a8e68 100644 --- a/linux-tkg-patches/6.0/0012-misc-additions.patch +++ b/linux-tkg-patches/6.0/0012-misc-additions.patch @@ -649,87 +649,3 @@ index 794062ab57fca4..9e6c23266a1a0f 100644 /* ttm_resource_ioremap only supports contiguous memory */ if (end != cursor.start) return false; - - -From 74ad906a96a249b134a26bb12049ac72c91af977 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sat, 22 Oct 2022 01:48:17 +0200 -Subject: [PATCH 9/9] Revert "ALSA: hda: Fix page fault in - snd_hda_codec_shutdown()" - -This reverts commit 7494e2e6c55ed192f2b91c821fd6832744ba8741. - -This patch depends on others from its series, which were not -backported, causing probing to fail due to missing initialization. - -See: https://github.com/thesofproject/linux/issues/3764 ---- - sound/pci/hda/hda_codec.c | 41 ++++++++++++++++++++------------------- - 1 file changed, 21 insertions(+), 20 deletions(-) - -diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index 4ae8b9574..384426d7e 100644 ---- a/sound/pci/hda/hda_codec.c -+++ b/sound/pci/hda/hda_codec.c -@@ -931,28 +931,8 @@ snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr, - } - - codec->bus = bus; -- codec->depop_delay = -1; -- codec->fixup_id = HDA_FIXUP_ID_NOT_SET; -- codec->core.dev.release = snd_hda_codec_dev_release; -- codec->core.exec_verb = codec_exec_verb; - codec->core.type = HDA_DEV_LEGACY; - -- mutex_init(&codec->spdif_mutex); -- mutex_init(&codec->control_mutex); -- snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32); -- snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32); -- snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16); -- snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16); -- snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8); -- snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16); -- snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16); -- snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8); -- INIT_LIST_HEAD(&codec->conn_list); -- INIT_LIST_HEAD(&codec->pcm_list_head); -- INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work); -- refcount_set(&codec->pcm_ref, 1); -- init_waitqueue_head(&codec->remove_sleep); -- - return codec; - } - EXPORT_SYMBOL_GPL(snd_hda_codec_device_init); -@@ -1005,8 +985,29 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card, - if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS)) - return -EINVAL; - -+ codec->core.dev.release = snd_hda_codec_dev_release; -+ codec->core.exec_verb = codec_exec_verb; -+ - codec->card = card; - codec->addr = codec_addr; -+ mutex_init(&codec->spdif_mutex); -+ mutex_init(&codec->control_mutex); -+ snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32); -+ snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32); -+ snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16); -+ snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16); -+ snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8); -+ snd_array_init(&codec->spdif_out, sizeof(struct hda_spdif_out), 16); -+ snd_array_init(&codec->jacktbl, sizeof(struct hda_jack_tbl), 16); -+ snd_array_init(&codec->verbs, sizeof(struct hda_verb *), 8); -+ INIT_LIST_HEAD(&codec->conn_list); -+ INIT_LIST_HEAD(&codec->pcm_list_head); -+ refcount_set(&codec->pcm_ref, 1); -+ init_waitqueue_head(&codec->remove_sleep); -+ -+ INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work); -+ codec->depop_delay = -1; -+ codec->fixup_id = HDA_FIXUP_ID_NOT_SET; - - #ifdef CONFIG_PM - codec->power_jiffies = jiffies; --- -2.38.0.rc1.6.g4fd6c5e444 -