Attachment 117279 Details for Bug 91371 – debug/test diff

debug/test diff

debug-test-eld-diff (text/plain), 1.63 KB, created by Andy Furniss on 2015-07-21 16:32:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Furniss

Created: 2015-07-21 16:32:16 UTC

Size: 1.63 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>index 6e77964..769b593 100644
>--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>@@ -1501,12 +1501,16 @@ static void dce_v10_0_audio_write_speaker_allocation(struct drm_encoder *encoder
> 	/* set HDMI mode */
> 	tmp = REG_SET_FIELD(tmp, AZALIA_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER,
> 			    HDMI_CONNECTION, 1);
>-	if (sad_count)
>+	if (sad_count) {
>+		DRM_ERROR("[ADF] setting speaker allocation to sadb[0] = %x\n", sadb[0]);
> 		tmp = REG_SET_FIELD(tmp, AZALIA_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER,
> 				    SPEAKER_ALLOCATION, sadb[0]);
>-	else
>+	}
>+	else {
>+		DRM_ERROR("[ADF] setting speaker allocation to 5 (stereo?)\n");
> 		tmp = REG_SET_FIELD(tmp, AZALIA_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER,
>-				    SPEAKER_ALLOCATION, 5); /* stereo */
>+				    SPEAKER_ALLOCATION, 1); /* stereo */
>+	}
> 	WREG32_AUDIO_ENDPT(dig->afmt->pin->offset,
> 			   ixAZALIA_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
> 
>diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
>index 745535d..d8d3004 100644
>--- a/sound/pci/hda/hda_intel.c
>+++ b/sound/pci/hda/hda_intel.c
>@@ -2238,6 +2238,8 @@ static const struct pci_device_id azx_ids[] = {
> 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> 	{ PCI_DEVICE(0x1002, 0xaac8),
> 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>+	{ PCI_DEVICE(0x1002, 0xaad8),
>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> 	/* VIA VT8251/VT8237A */
> 	{ PCI_DEVICE(0x1106, 0x3288),
> 	  .driver_data = AZX_DRIVER_VIA | AZX_DCAPS_POSFIX_VIA },

Actions: View

Attachments on bug 91371: 117191 | 117192 | 117193 | 117197 | 117198 | 117268 | 117279

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.