Attachment 139735 Details for Bug 106597 – drm-next-4.18-wip debug patch 3

[patch] drm-next-4.18-wip debug patch 3

drm-next-4.18-wip-debug3.patch (text/plain), 7.35 KB, created by Lukas Wunner on 2018-05-24 10:04:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Wunner

Created: 2018-05-24 10:04:15 UTC

Size: 7.35 KB

patch

obsolete

>diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
>index 06536e01ed94..16724402c934 100644
>--- a/include/sound/hdaudio.h
>+++ b/include/sound/hdaudio.h
>@@ -335,11 +335,13 @@ void snd_hdac_bus_remove_device(struct hdac_bus *bus,
> 
> static inline void snd_hdac_codec_link_up(struct hdac_device *codec)
> {
>+	dev_info(&codec->dev, "codec_powered = 1\n");
> 	set_bit(codec->addr, &codec->bus->codec_powered);
> }
> 
> static inline void snd_hdac_codec_link_down(struct hdac_device *codec)
> {
>+	dev_info(&codec->dev, "codec_powered = 0\n");
> 	clear_bit(codec->addr, &codec->bus->codec_powered);
> }
> 
>diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c
>index 714a51721a31..96e8290690ef 100644
>--- a/sound/hda/hdac_bus.c
>+++ b/sound/hda/hdac_bus.c
>@@ -191,6 +191,7 @@ int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec)
> 
> 	list_add_tail(&codec->list, &bus->codec_list);
> 	bus->caddr_tbl[codec->addr] = codec;
>+	dev_info(&codec->dev, "codec_powered = 1 (add)\n");
> 	set_bit(codec->addr, &bus->codec_powered);
> 	bus->num_codecs++;
> 	return 0;
>@@ -211,6 +212,7 @@ void snd_hdac_bus_remove_device(struct hdac_bus *bus,
> 	list_del_init(&codec->list);
> 	bus->caddr_tbl[codec->addr] = NULL;
> 	clear_bit(codec->addr, &bus->codec_powered);
>+	dev_info(&codec->dev, "codec_powered = 0 (remove)\n");
> 	bus->num_codecs--;
> 	flush_work(&bus->unsol_work);
> }
>diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
>index 5bc3a7468e17..af8536cbc935 100644
>--- a/sound/pci/hda/hda_codec.c
>+++ b/sound/pci/hda/hda_codec.c
>@@ -2686,18 +2686,27 @@ void snd_hda_codec_set_power_to_all(struct hda_codec *codec, hda_nid_t fg,
> {
> 	hda_nid_t nid;
> 
>+	dev_info(&codec->core.dev, "%s: power_state = %#x\n", __func__, power_state);
>+
> 	for_each_hda_codec_node(nid, codec) {
> 		unsigned int wcaps = get_wcaps(codec, nid);
> 		unsigned int state = power_state;
>-		if (!(wcaps & AC_WCAP_POWER))
>+		dev_info(&codec->core.dev, "%s: nid = %#hx\n", __func__, nid);
>+		if (!(wcaps & AC_WCAP_POWER)) {
>+			dev_info(&codec->core.dev, "%s: !(wcaps & AC_WCAP_POWER)\n", __func__);
> 			continue;
>+		}
> 		if (codec->power_filter) {
> 			state = codec->power_filter(codec, nid, power_state);
>-			if (state != power_state && power_state == AC_PWRST_D3)
>+			dev_info(&codec->core.dev, "%s: after ->power_filter, state = %#x\n", __func__, state);
>+			if (state != power_state && power_state == AC_PWRST_D3) {
>+				dev_info(&codec->core.dev, "%s: state != power_state = %d, power_state == AC_PWRST_D3 = %d\n", __func__, state != power_state, power_state == AC_PWRST_D3);
> 				continue;
>+			}
> 		}
>+		dev_info(&codec->core.dev, "%s: snd_hda_codec_write() returned %d\n", __func__,
> 		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE,
>-				    state);
>+				    state));
> 	}
> }
> EXPORT_SYMBOL_GPL(snd_hda_codec_set_power_to_all);
>@@ -2751,20 +2760,27 @@ static unsigned int hda_set_power_state(struct hda_codec *codec,
> 
> 	/* repeat power states setting at most 10 times*/
> 	for (count = 0; count < 10; count++) {
>-		if (codec->patch_ops.set_power_state)
>+		dev_info(&codec->core.dev, "%s: try %d\n", __func__, count);
>+		if (codec->patch_ops.set_power_state) {
>+			dev_info(&codec->core.dev, "%s: calling patch_ops.set_power_state()\n", __func__);
> 			codec->patch_ops.set_power_state(codec, fg,
> 							 power_state);
>-		else {
>+		} else {
> 			state = power_state;
>-			if (codec->power_filter)
>+			dev_info(&codec->core.dev, "%s: initial state = %#x\n", __func__, state);
>+			if (codec->power_filter) {
> 				state = codec->power_filter(codec, fg, state);
>+				dev_info(&codec->core.dev, "%s: after ->power_filter(), state = %#x\n", __func__, state);
>+			}
> 			if (state == power_state || power_state != AC_PWRST_D3)
>+				dev_info(&codec->core.dev, "%s: snd_hda_codec_read() returned %d", __func__,
> 				snd_hda_codec_read(codec, fg, flags,
> 						   AC_VERB_SET_POWER_STATE,
>-						   state);
>+						   state));
> 			snd_hda_codec_set_power_to_all(codec, fg, power_state);
> 		}
> 		state = snd_hda_sync_power_state(codec, fg, power_state);
>+		dev_info(&codec->core.dev, "%s: after snd_hda_sync_power_state(), state = %#x\n", __func__, state);
> 		if (!(state & AC_PWRST_ERROR))
> 			break;
> 	}
>@@ -2840,6 +2856,7 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec)
> 		codec->patch_ops.suspend(codec);
> 	hda_cleanup_all_streams(codec);
> 	state = hda_set_power_state(codec, AC_PWRST_D3);
>+	dev_info(&codec->core.dev, "%s: hda_set_power_state() returned %#x\n", __func__, state);
> 	update_power_acct(codec, true);
> 	atomic_dec(&codec->core.in_pm);
> 	return state;
>@@ -2887,6 +2904,8 @@ static int hda_codec_runtime_suspend(struct device *dev)
> 	list_for_each_entry(pcm, &codec->pcm_list_head, list)
> 		snd_pcm_suspend_all(pcm->pcm);
> 	state = hda_call_codec_suspend(codec);
>+	dev_info(dev, "%s: hda_call_codec_suspend() returned %#x\n", __func__, state);
>+	dev_info(dev, "%s: codec_has_clkstop = %#x, codec_has_epss = %#x, state & AC_PWRST_CLK_STOP_OK = %#x\n", __func__, codec_has_clkstop(codec), codec_has_epss(codec), state & AC_PWRST_CLK_STOP_OK);
> 	if (codec_has_clkstop(codec) && codec_has_epss(codec) &&
> 	    (state & AC_PWRST_CLK_STOP_OK))
> 		snd_hdac_codec_link_down(&codec->core);
>diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
>index b0c8c79848a9..ba693550d873 100644
>--- a/sound/pci/hda/hda_intel.c
>+++ b/sound/pci/hda/hda_intel.c
>@@ -1104,27 +1104,38 @@ static int azx_runtime_suspend(struct device *dev)
> 	struct azx *chip;
> 	struct hda_intel *hda;
> 
>-	if (!card)
>+	if (!card) {
>+		dev_info(dev, "%s: !card\n", __func__);
> 		return 0;
>+	}
> 
> 	chip = card->private_data;
> 	hda = container_of(chip, struct hda_intel, chip);
>-	if (chip->disabled || hda->init_failed)
>+	if (chip->disabled || hda->init_failed) {
>+		dev_info(dev, "%s: chip->disabled || hda->init_failed\n", __func__);
> 		return 0;
>+	}
> 
>-	if (!azx_has_pm_runtime(chip))
>+	if (!azx_has_pm_runtime(chip)) {
>+		dev_info(dev, "%s: !azx_has_pm_runtime(chip)\n", __func__);
> 		return 0;
>+	}
> 
> 	/* enable controller wake up event */
>+	dev_info(dev, "%s: calling azx_writew()\n", __func__);
> 	azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) |
> 		  STATESTS_INT_MASK);
> 
>+	dev_info(dev, "%s: calling azx_stop_chip()\n", __func__);
> 	azx_stop_chip(chip);
>+	dev_info(dev, "%s: calling azx_enter_link_reset()\n", __func__);
> 	azx_enter_link_reset(chip);
>+	dev_info(dev, "%s: calling azx_clear_irq_pending()\n", __func__);
> 	azx_clear_irq_pending(chip);
> 	if ((chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
> 		&& hda->need_i915_power)
> 		snd_hdac_display_power(azx_bus(chip), false);
>+	dev_info(dev, "%s: finished\n", __func__);
> 
> 	trace_azx_runtime_suspend(chip);
> 	return 0;
>@@ -1189,14 +1200,19 @@ static int azx_runtime_idle(struct device *dev)
> 	struct azx *chip;
> 	struct hda_intel *hda;
> 
>-	if (!card)
>+	if (!card) {
>+		dev_info(dev, "%s: !card\n", __func__);
> 		return 0;
>+	}
> 
> 	chip = card->private_data;
> 	hda = container_of(chip, struct hda_intel, chip);
>-	if (chip->disabled || hda->init_failed)
>+	if (chip->disabled || hda->init_failed) {
>+		dev_info(dev, "%s: chip->disabled || hda->init_failed\n", __func__);
> 		return 0;
>+	}
> 
>+	dev_info(dev, "%s: !power_save_controller = %d, !azx_has_pm_runtime(chip) = %d, azx_bus(chip)->codec_powered = %#lx, !chip->running = %d\n", __func__, !power_save_controller, !azx_has_pm_runtime(chip), azx_bus(chip)->codec_powered, !chip->running);
> 	if (!power_save_controller || !azx_has_pm_runtime(chip) ||
> 	    azx_bus(chip)->codec_powered || !chip->running)
> 		return -EBUSY;

Actions: View | Splinter Review

Attachments on bug 106597: 139673 | 139674 | 139675 | 139688 | 139692 | 139706 | 139723 | 139735 | 139736 | 139739 | 139740

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.