intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH 0/1] DG2 audio support
@ 2021-02-23 12:59 Kai Vehmanen
  2021-02-23 12:59 ` [Intel-gfx] [PATCH 1/1] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid Kai Vehmanen
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Kai Vehmanen @ 2021-02-23 12:59 UTC (permalink / raw)
  To: intel-gfx

Hey,
small patch to add missing bits to enable audio with DG2.

---
baseline: 24107b584f752a997f091ab88491a81bb5c0dea1
pile-commit: 75aa81cc8bc853e937f4dc7243793333bd11c437
range-diff:
   -:  ------------ > 1424:  efde3c96d1a9 ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid

 series                                             |  1 +
 ...a-Add-Intel-DG2-PCI-ID-and-HDMI-codec-vid.patch | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/series b/series
index 9f67f1f94509..1e18865888bb 100644
--- a/series
+++ b/series
@@ -1423,6 +1423,7 @@
 0001-INTEL_DII-drm-i915-dg2-MOCS-index-programming-for-va.patch
 0001-INTEL_DII-i915-perf-Get-OA-timestamp-frequency-param.patch
 0001-INTEL_DII-drm-i915-align-the-plane_vma-to-min_page_s.patch
+0001-ALSA-hda-Add-Intel-DG2-PCI-ID-and-HDMI-codec-vid.patch
 0001-INTEL_DII-END-dg2-DG2-Platform-Enabling.patch
 0001-INTEL_DII-AUTO-CHOP-BRANCH-dg2.patch
 0001-INTEL_DII-START-pvc-Ponte-Vecchio-Platform-Enabling.patch
diff --git a/0001-ALSA-hda-Add-Intel-DG2-PCI-ID-and-HDMI-codec-vid.patch b/0001-ALSA-hda-Add-Intel-DG2-PCI-ID-and-HDMI-codec-vid.patch
new file mode 100644
index 000000000000..c7ce2fb5802f
--- /dev/null
+++ b/0001-ALSA-hda-Add-Intel-DG2-PCI-ID-and-HDMI-codec-vid.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+Date: Thu, 18 Feb 2021 12:33:48 +0200
+Subject: [PATCH] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid
+
+Add HD Audio PCI ID and HDMI codec vendor ID for Intel DG2.
+
+Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+---
+ sound/pci/hda/hda_intel.c  | 6 +++++-
+ sound/pci/hda/patch_hdmi.c | 1 +
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -368,7 +368,8 @@ enum {
+ 					((pci)->device == 0x0c0c) || \
+ 					((pci)->device == 0x0d0c) || \
+ 					((pci)->device == 0x160c) || \
+-					((pci)->device == 0x490d))
++					((pci)->device == 0x490d) || \
++					((pci)->device == 0x4f90))
+ 
+ #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
+ 
+@@ -2506,6 +2507,9 @@ static const struct pci_device_id azx_ids[] = {
+ 	/* DG1 */
+ 	{ PCI_DEVICE(0x8086, 0x490d),
+ 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
++	/* DG2 */
++	{ PCI_DEVICE(0x8086, 0x4f90),
++	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+ 	/* Alderlake-S */
+ 	{ PCI_DEVICE(0x8086, 0x7ad0),
+ 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -4347,6 +4347,7 @@ HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),
+ HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI",	patch_i915_tgl_hdmi),
+ HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),
+ HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),
++HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_tgl_hdmi),
+ HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),
+ HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),
+ HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi),
--
git-pile 0.96

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Intel-gfx] [PATCH 1/1] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid
  2021-02-23 12:59 [Intel-gfx] [PATCH 0/1] DG2 audio support Kai Vehmanen
@ 2021-02-23 12:59 ` Kai Vehmanen
  2021-02-23 12:59 ` [Intel-gfx] [REVIEW] Full tree diff against internal/internal Kai Vehmanen
  2021-02-23 13:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for DG2 audio support Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Kai Vehmanen @ 2021-02-23 12:59 UTC (permalink / raw)
  To: intel-gfx

Add HD Audio PCI ID and HDMI codec vendor ID for Intel DG2.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 sound/pci/hda/hda_intel.c  | 6 +++++-
 sound/pci/hda/patch_hdmi.c | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 27e02cdef6d9..8d3d7e700ca3 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -368,7 +368,8 @@ enum {
 					((pci)->device == 0x0c0c) || \
 					((pci)->device == 0x0d0c) || \
 					((pci)->device == 0x160c) || \
-					((pci)->device == 0x490d))
+					((pci)->device == 0x490d) || \
+					((pci)->device == 0x4f90))
 
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
 
@@ -2506,6 +2507,9 @@ static const struct pci_device_id azx_ids[] = {
 	/* DG1 */
 	{ PCI_DEVICE(0x8086, 0x490d),
 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	/* DG2 */
+	{ PCI_DEVICE(0x8086, 0x4f90),
+	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
 	/* Alderlake-S */
 	{ PCI_DEVICE(0x8086, 0x7ad0),
 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 70f34f9e9b2c..4655286cada2 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4347,6 +4347,7 @@ HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),
+HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi),
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Intel-gfx] [REVIEW] Full tree diff against internal/internal
  2021-02-23 12:59 [Intel-gfx] [PATCH 0/1] DG2 audio support Kai Vehmanen
  2021-02-23 12:59 ` [Intel-gfx] [PATCH 1/1] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid Kai Vehmanen
@ 2021-02-23 12:59 ` Kai Vehmanen
  2021-02-23 13:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for DG2 audio support Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Kai Vehmanen @ 2021-02-23 12:59 UTC (permalink / raw)
  To: intel-gfx

Auto-generated diff between internal/internal..internal
---
 sound/pci/hda/hda_intel.c  | 6 +++++-
 sound/pci/hda/patch_hdmi.c | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 27e02cdef6d9..8d3d7e700ca3 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -368,7 +368,8 @@ enum {
 					((pci)->device == 0x0c0c) || \
 					((pci)->device == 0x0d0c) || \
 					((pci)->device == 0x160c) || \
-					((pci)->device == 0x490d))
+					((pci)->device == 0x490d) || \
+					((pci)->device == 0x4f90))
 
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
 
@@ -2506,6 +2507,9 @@ static const struct pci_device_id azx_ids[] = {
 	/* DG1 */
 	{ PCI_DEVICE(0x8086, 0x490d),
 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	/* DG2 */
+	{ PCI_DEVICE(0x8086, 0x4f90),
+	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
 	/* Alderlake-S */
 	{ PCI_DEVICE(0x8086, 0x7ad0),
 	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 70f34f9e9b2c..4655286cada2 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4347,6 +4347,7 @@ HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),
+HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi),
--
git-pile 0.96

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for DG2 audio support
  2021-02-23 12:59 [Intel-gfx] [PATCH 0/1] DG2 audio support Kai Vehmanen
  2021-02-23 12:59 ` [Intel-gfx] [PATCH 1/1] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid Kai Vehmanen
  2021-02-23 12:59 ` [Intel-gfx] [REVIEW] Full tree diff against internal/internal Kai Vehmanen
@ 2021-02-23 13:11 ` Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2021-02-23 13:11 UTC (permalink / raw)
  To: Kai Vehmanen; +Cc: intel-gfx

== Series Details ==

Series: DG2 audio support
URL   : https://patchwork.freedesktop.org/series/87317/
State : failure

== Summary ==

Applying: ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid
error: sha1 information is lacking or useless (sound/pci/hda/hda_intel.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-23 13:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-23 12:59 [Intel-gfx] [PATCH 0/1] DG2 audio support Kai Vehmanen
2021-02-23 12:59 ` [Intel-gfx] [PATCH 1/1] ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid Kai Vehmanen
2021-02-23 12:59 ` [Intel-gfx] [REVIEW] Full tree diff against internal/internal Kai Vehmanen
2021-02-23 13:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for DG2 audio support Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).