On Sun, Jan 21, 2018 at 08:41:19AM -0800, Bryan Vyhmeister wrote:
> >Synopsis: inteldrm(4) not attaching on Intel Skylake Iris Pro 580 graphics
> >Category: amd64
> >Environment:
> System : OpenBSD 6.2
> Details : OpenBSD 6.2-current (GENERIC.MP) #379: Sat Jan 20
> 14:30:55 MST 2018
>
> [email protected]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> Architecture: OpenBSD.amd64
> Machine : amd64
> >Description:
> I picked up an Intel NUC6i7KYK and finally pulled it out of the box and
> installed the latest snapshot and noticed that inteldrm(4) does not attach
> even though this machine has Intel Skylake graphics. This is the unusual Iris
> Pro 580 in the NUC6i7KYK but I expected inteldrm(4) to attach and work fine.
> The install defaulted to using efifb(4) and wsfb(4) which work fine but are
> not accelerated obviously.
> >How-To-Repeat:
> Install latest snapshot and check dmesg.
> >Fix:
> Unknown
Here is a modified version of a diff from ccardenas@ to bring
the ids for the 580 and others in.
Index: sys/dev/pci/drm/i915_pciids.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/i915_pciids.h,v
retrieving revision 1.4
diff -u -p -r1.4 i915_pciids.h
--- sys/dev/pci/drm/i915_pciids.h 30 Sep 2017 07:36:56 -0000 1.4
+++ sys/dev/pci/drm/i915_pciids.h 22 Jan 2018 00:25:58 -0000
@@ -281,12 +281,20 @@
INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
- INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \
+ INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */ \
+
+#define INTEL_SKL_GT4_IDS(info) \
+ INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
+ INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
+ INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
+ INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
+ INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */
#define INTEL_SKL_IDS(info) \
INTEL_SKL_GT1_IDS(info), \
INTEL_SKL_GT2_IDS(info), \
- INTEL_SKL_GT3_IDS(info)
+ INTEL_SKL_GT3_IDS(info), \
+ INTEL_SKL_GT4_IDS(info)
#define INTEL_BXT_IDS(info) \
INTEL_VGA_DEVICE(0x0A84, info), \
Index: sys/dev/pci/drm/i915/i915_devlist.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/i915/i915_devlist.h,v
retrieving revision 1.7
diff -u -p -r1.7 i915_devlist.h
--- sys/dev/pci/drm/i915/i915_devlist.h 30 Sep 2017 07:36:56 -0000 1.7
+++ sys/dev/pci/drm/i915/i915_devlist.h 22 Jan 2018 00:26:18 -0000
@@ -148,7 +148,12 @@ static const struct pci_matchid i915_dev
{ 0x8086, 0x1926 },
{ 0x8086, 0x1927 },
{ 0x8086, 0x192b },
+ { 0x8086, 0x192d },
+ { 0x8086, 0x1932 },
+ { 0x8086, 0x193b },
+ { 0x8086, 0x193d },
{ 0x8086, 0x192a },
+ { 0x8086, 0x193a },
{ 0x8086, 0x0a84 },
{ 0x8086, 0x1a84 },
{ 0x8086, 0x1a85 },
Index: sys/dev/pci/drm/i915/i915_drv.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/i915/i915_drv.c,v
retrieving revision 1.108
diff -u -p -r1.108 i915_drv.c
--- sys/dev/pci/drm/i915/i915_drv.c 30 Sep 2017 07:36:56 -0000 1.108
+++ sys/dev/pci/drm/i915/i915_drv.c 22 Jan 2018 00:09:36 -0000
@@ -468,6 +468,7 @@ static const struct intel_device_info in
INTEL_SKL_GT1_IDS(&intel_skylake_info), \
INTEL_SKL_GT2_IDS(&intel_skylake_info), \
INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info), \
+ INTEL_SKL_GT4_IDS(&intel_skylake_gt3_info), \
INTEL_BXT_IDS(&intel_broxton_info), \
INTEL_KBL_GT1_IDS(&intel_kabylake_info), \
INTEL_KBL_GT2_IDS(&intel_kabylake_info), \
