On Sat, 24 Oct 2015 23:48:01 +0200 (CEST)
Mark Kettenis <mark.kette...@xs4all.nl> wrote:
> The diff below makes inteldrm(4) attach directly to pci(4) instead of
> vga(1). Because inteldrm(4) depends on intagp(4), this also make
> intagp(4) a child of inteldrm(4). Ultimately I'd like to integrate
> intagp(4) into inteldrm(4), but that's going to be a bit more work.
>
> This diff is needed to make inteldrm(4) work when OpenBSD gets booted
> by UEFI firmware. It will also make inteldrm(4) work on machines with
> discrete graphics.
>
> This diff needs to be tested on a wide range of hardware. So if you
> have a machine with inteldrm(4), please give it a shot. I'm
> particularly interested in testing on an x40.
works for me on vaio z (UEFI only).
On UEFI boot, efifb(4) tries to become the console and seems to break
the wsdisplay on inteldrm0 (switching X <=> console became unusable).
To avoid this I used the diff following.
Index: sys/arch/amd64/amd64/efifb.c
===================================================================
RCS file: /disk/cvs/openbsd/src/sys/arch/amd64/amd64/efifb.c,v
retrieving revision 1.6
diff -u -p -r1.6 efifb.c
--- sys/arch/amd64/amd64/efifb.c 7 Sep 2015 18:19:58 -0000 1.6
+++ sys/arch/amd64/amd64/efifb.c 26 Oct 2015 05:49:37 -0000
@@ -91,6 +91,10 @@ int
efifb_match(struct device *parent, void *cf, void *aux)
{
struct efifb_attach_args *eaa = aux;
+ extern int vga_console_attached;
+
+ if (vga_console_attached)
+ return (0);
if (strcmp(eaa->eaa_name, efifb_cd.cd_name) == 0 &&
bios_efiinfo != NULL)
OpenBSD 5.8-current (GENERIC.MP) #63: Mon Oct 26 14:59:03 JST 2015
yasu...@yasuoka-ob1.tokyo.iiji.jp:/home/yasuoka/source/openbsd/cvs/head/src/sys/arch/amd64/compile/GENERIC.MP
RTC BIOS diagnostic error
7f<ROM_cksum,config_unit,memory_size,fixed_disk,invalid_time>
real mem = 8470687744 (8078MB)
avail mem = 8209833984 (7829MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xacd70000 (20 entries)
bios0: vendor Phoenix Technologies Ltd. version "R0181B6" date 02/19/2015
bios0: VAIO Corporation VAIO
acpi0 at bios0: rev 2
acpi0: sleep states S0 S4 S5
acpi0: tables DSDT FACP ASF! HPET LPIT APIC MCFG WDAT SSDT SSDT SSDT SSDT SSDT
SSDT SSDT SSDT PCCT SSDT UEFI MSDM TPM2 SSDT BATB FPDT UEFI BGRT CSRT DMAR
acpi0: wakeup devices PEGP(S4) PEG0(S4) PEGP(S4) PEG1(S4) PEGP(S4) PEG2(S4)
GLAN(S4) EHC1(S4) EHC2(S4) XHC_(S4) TPD4(S4) TPD7(S0) TPD8(S0) HDEF(S4)
PXSX(S4) RP01(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i5-5257U CPU @ 2.70GHz, 2594.46 MHz
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,SENSOR,ARAT
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM) i5-5257U CPU @ 2.70GHz, 2594.01 MHz
cpu1:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,SENSOR,ARAT
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: Intel(R) Core(TM) i5-5257U CPU @ 2.70GHz, 2594.01 MHz
cpu2:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,SENSOR,ARAT
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i5-5257U CPU @ 2.70GHz, 2594.01 MHz
cpu3:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,SENSOR,ARAT
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 40 pins
acpimcfg0 at acpi0 addr 0xf8000000, bus 0-63
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG0)
acpiprt2 at acpi0: bus -1 (PEG1)
acpiprt3 at acpi0: bus -1 (PEG2)
acpiprt4 at acpi0: bus -1 (RP01)
acpiprt5 at acpi0: bus -1 (RP02)
acpiprt6 at acpi0: bus 1 (RP03)
acpiprt7 at acpi0: bus -1 (RP04)
acpiprt8 at acpi0: bus -1 (RP05)
acpiprt9 at acpi0: bus 2 (RP06)
acpiprt10 at acpi0: bus -1 (RP07)
acpiprt11 at acpi0: bus -1 (RP08)
acpiec0 at acpi0
acpicpu0 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33),
C1(1000@1 mwait.1), PSS
acpicpu1 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33),
C1(1000@1 mwait.1), PSS
acpicpu2 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33),
C1(1000@1 mwait.1), PSS
acpicpu3 at acpi0: C3(200@506 mwait.1@0x60), C2(200@148 mwait.1@0x33),
C1(1000@1 mwait.1), PSS
acpipwrres0 at acpi0: PG00, resource for PEG0
acpipwrres1 at acpi0: PG01, resource for PEG1
acpipwrres2 at acpi0: PG02, resource for PEG2
acpipwrres3 at acpi0: PX04, resource for HS04
acpipwrres4 at acpi0: PX0C, resource for SSP3
acpipwrres5 at acpi0: PSEN, resource for SHUB, I2C0, TPL2
acpipwrres6 at acpi0: PXTC, resource for SHUB, I2C0, TPL2
acpipwrres7 at acpi0: PAUD, resource for HDEF
acpitz0 at acpi0: critical temperature is 102 degC
acpitz1 at acpi0: no critical temperature defined
acpibat0 at acpi0: BAT1 model "VAIO Battery" serial 123456789 type VAIO oem
"VAIO"
acpiac0 at acpi0: AC unit online
acpibtn0 at acpi0: LID0
acpibtn1 at acpi0: PWRB
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: DD1F
cpu0: Enhanced SpeedStep 2594 MHz: speeds: 2701, 2700, 2600, 2400, 2200, 2100,
1900, 1800, 1600, 1400, 1300, 1100, 1000, 800, 700, 500 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel Core 5G Host" rev 0x09
inteldrm0 at pci0 dev 2 function 0 "Intel Iris Graphics 6100" rev 0x09
drm0 at inteldrm0
inteldrm0: msi
LP PCH doesn't have FDI
inteldrm0: 2560x1440
wsdisplay0 at inteldrm0 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
azalia0 at pci0 dev 3 function 0 "Intel Core 5G HD Audio" rev 0x09: msi
xhci0 at pci0 dev 20 function 0 "Intel 9 Series xHCI" rev 0x03: msi
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 "Intel xHCI root hub" rev 3.00/1.00 addr 1
"Intel 9 Series MEI" rev 0x03 at pci0 dev 22 function 0 not configured
azalia1 at pci0 dev 27 function 0 "Intel 9 Series HD Audio" rev 0x03: msi
azalia1: codecs: Realtek ALC282
audio0 at azalia1
ppb0 at pci0 dev 28 function 0 "Intel 9 Series PCIE" rev 0xe3: msi
pci1 at ppb0 bus 1
iwm0 at pci1 dev 0 function 0 "Intel Dual Band Wireless AC 7265" rev 0x59, msi
ppb1 at pci0 dev 28 function 5 "Intel 9 Series PCIE" rev 0xe3: msi
pci2 at ppb1 bus 2
ahci0 at pci2 dev 0 function 0 "Samsung SM951" rev 0x01: apic 2 int 16, AHCI 1.3
ahci0: port 0: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 0 lun 0: <ATA, SAMSUNG MZHPV512, BXW2> SCSI3 0/direct
fixed naa.500253890000f48b
sd0: 488386MB, 512 bytes/sector, 1000215216 sectors, thin
pcib0 at pci0 dev 31 function 0 "Intel 9 Series LPC" rev 0x03
ichiic0 at pci0 dev 31 function 3 "Intel 9 Series SMBus" rev 0x03: apic 2 int 17
iic0 at ichiic0
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
efifb0 at mainbus0
wsdisplay at efifb0 not configured
nvram: invalid checksum
uhidev0 at uhub0 port 2 configuration 1 interface 0 "Microsoft Microsoft\M-.
Nano Transceiver v1.0" rev 2.00/7.04 addr 2
uhidev0: iclass 3/1
ukbd0 at uhidev0: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub0 port 2 configuration 1 interface 1 "Microsoft Microsoft\M-.
Nano Transceiver v1.0" rev 2.00/7.04 addr 2
uhidev1: iclass 3/1, 26 report ids
uhid0 at uhidev1 reportid 18: input=0, output=0, feature=1
uhid1 at uhidev1 reportid 23: input=0, output=0, feature=1
ums0 at uhidev1 reportid 26: 5 buttons, Z dir
wsmouse0 at ums0 mux 0
uhidev2 at uhub0 port 2 configuration 1 interface 2 "Microsoft Microsoft\M-.
Nano Transceiver v1.0" rev 2.00/7.04 addr 2
uhidev2: iclass 3/0, 8 report ids
uhid2 at uhidev2 reportid 3: input=1, output=0, feature=0
uhid3 at uhidev2 reportid 4: input=1, output=0, feature=0
uhid4 at uhidev2 reportid 7: input=7, output=0, feature=0
uhid5 at uhidev2 reportid 8: input=1, output=0, feature=0
uvideo0 at uhub0 port 4 configuration 1 interface 0 "Chicony Front Camera" rev
2.00/32.61 addr 3
video0 at uvideo0
ugen0 at uhub0 port 5 "Intel product 0x0a2a" rev 2.01/0.01 addr 4
umass0 at uhub0 port 8 configuration 1 interface 0 "Generic USB2.0-CRW" rev
2.01/77.11 addr 5
umass0: using SCSI over Bulk-Only
scsibus2 at umass0: 2 targets, initiator 0
sd1 at scsibus2 targ 1 lun 0: <Generic-, SD/MMC/MS PRO, 1.00> SCSI2 0/direct
removable serial.0bda0177112761000000
sd1: 60906MB, 512 bytes/sector, 124735488 sectors
vscsi0 at root
scsibus3 at vscsi0: 256 targets
softraid0 at root
scsibus4 at softraid0: 256 targets
root on sd0a (3aac7e66fb7d173d.a) swap on sd0b dump on sd0b
WARNING: / was not properly unmounted
clock: unknown CMOS layout
iwm0: hw rev 0x210, fw ver 25.228 (API ver 9), address xx:xx:xx:xx:xx:xx
