[Intel-gfx] [PATCH] intel: sync i915_pciids.h with kernel

[Intel-gfx] [PATCH] intel: sync i915_pciids.h with kernel

[ramadevi.gandi]

From: Gandi Ramadevi <ramadevi.gandi@intel.com>

Add DG1 PCI ID

Signed-off-by: Gandi Ramadevi <ramadevi.gandi@intel.com>
---
 intel/i915_pciids.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/intel/i915_pciids.h b/intel/i915_pciids.h
index 662d8351..3de6e574 100644
--- a/intel/i915_pciids.h
+++ b/intel/i915_pciids.h
@@ -605,4 +605,8 @@
 	INTEL_VGA_DEVICE(0x9AD9, info), \
 	INTEL_VGA_DEVICE(0x9AF8, info)
 
+/* DG1 */
+#define INTEL_DG1_IDS(info) \
+        INTEL_VGA_DEVICE(0x4905, info)
+
 #endif /* _I915_PCIIDS_H */
-- 
2.25.1

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

[Intel-gfx] ✗ Fi.CI.BUILD: failure for intel: sync i915_pciids.h with kernel

[Patchwork]

== Series Details ==

Series: intel: sync i915_pciids.h with kernel
URL   : https://patchwork.freedesktop.org/series/78256/
State : failure

== Summary ==

Applying: intel: sync i915_pciids.h with kernel
Using index info to reconstruct a base tree...
A	intel/i915_pciids.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/i915_pciids.h
CONFLICT (content): Merge conflict in include/drm/i915_pciids.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 intel: sync i915_pciids.h with kernel
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