On 06/07/13 16:46, Mark Kettenis wrote:
CVSROOT: /cvs
Module name: src
Changes by: kette...@cvs.openbsd.org 2013/06/07 14:46:15
Modified files:
sys/uvm : uvm_device.c uvm_device.h
sys/dev/pci/drm: drm.h drmP.h drm_drv.c
sys/dev/pci/drm/i915: i915_gem.c
Log message:
Add proper mmap(2) support for drm(4)/inteldrm(4). This changes the
DRM_I915_GEM_MMAP and DRM_I915_GEM_MMAP_GTT ioctls to be compatible with
Linux. This also is the first step that moves us away from accessing all
graphics memory through the GTT, which should make things faster.
ok tedu@ (for the uvm bits)
I just built a new kernel using -current sources, including this change,
in preparation to build the system. It didn't work out very well and I
had to revert to obsd.
The kernel boot display looks normal, going from 25->40 rows properly,
however, once X starts the puffy "OpenBSD 5.3" logo is garbled beyond
recognition. The surrounding text of the hostname and name/password
stuff looks fine. After logging in and spectrwm starts, the display is
completely distorted and unusable.
Just thought I'd let you know. dmesg from the previous (working) kernel:
OpenBSD 5.3-current (GENERIC.MP) #1: Wed Jun 5 05:06:14 EDT 2013
r...@elminster.blackstaff.ca:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 16835637248 (16055MB)
avail mem = 16379756544 (15620MB)
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xeb410 (112 entries)
bios0: vendor American Megatrends Inc. version "0408" date 06/05/2012
bios0: ASUSTeK COMPUTER INC. P8Z77-V PREMIUM
acpi0 at bios0: rev 2
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT MCFG HPET SSDT SSDT SSDT BGRT
acpi0: wakeup devices PS2K(S4) PS2M(S4) P0P1(S4) PXSX(S4) RP01(S4)
PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) PXSX(S4) RP04(S4) PXSX(S4) RP05(S4)
PXSX(S4) RP06(S4) PXSX(S4) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3606.22 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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
cpu0: apic clock running at 103MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 0, core 1, package 0
cpu2 at mainbus0: apid 4 (application processor)
cpu2: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 0, core 2, package 0
cpu3 at mainbus0: apid 6 (application processor)
cpu3: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 0, core 3, package 0
cpu4 at mainbus0: apid 1 (application processor)
cpu4: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 MHz
cpu4:
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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu4: 256KB 64b/line 8-way L2 cache
cpu4: smt 1, core 0, package 0
cpu5 at mainbus0: apid 3 (application processor)
cpu5: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 MHz
cpu5:
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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu5: 256KB 64b/line 8-way L2 cache
cpu5: smt 1, core 1, package 0
cpu6 at mainbus0: apid 5 (application processor)
cpu6: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 MHz
cpu6:
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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu6: 256KB 64b/line 8-way L2 cache
cpu6: smt 1, core 2, package 0
cpu7 at mainbus0: apid 7 (application processor)
cpu7: Intel(R) Core(TM) i7-3770K CPU @ 3.50GHz, 3605.67 MHz
cpu7:
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,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu7: 256KB 64b/line 8-way L2 cache
cpu7: smt 1, core 3, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf8000000, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (P0P1)
acpiprt2 at acpi0: bus 5 (RP01)
acpiprt3 at acpi0: bus -1 (RP02)
acpiprt4 at acpi0: bus -1 (RP03)
acpiprt5 at acpi0: bus -1 (RP04)
acpiprt6 at acpi0: bus 51 (RP05)
acpiprt7 at acpi0: bus -1 (RP06)
acpiprt8 at acpi0: bus -1 (RP08)
acpiprt9 at acpi0: bus 1 (PEG0)
acpiprt10 at acpi0: bus -1 (PEG1)
acpiprt11 at acpi0: bus -1 (PEG2)
acpiprt12 at acpi0: bus -1 (PEG3)
acpiprt13 at acpi0: bus 52 (RP07)
acpiprt14 at acpi0: bus 56 (BR27)
acpiec0 at acpi0
acpiec at acpi0 not configured
acpicpu0 at acpi0: C3, C1, PSS
acpicpu1 at acpi0: C3, C1, PSS
acpicpu2 at acpi0: C3, C1, PSS
acpicpu3 at acpi0: C3, C1, PSS
acpicpu4 at acpi0: C3, C1, PSS
acpicpu5 at acpi0: C3, C1, PSS
acpicpu6 at acpi0: C3, C1, PSS
acpicpu7 at acpi0: C3, C1, PSS
acpipwrres0 at acpi0: FN00
acpipwrres1 at acpi0: FN01
acpipwrres2 at acpi0: FN02
acpipwrres3 at acpi0: FN03
acpipwrres4 at acpi0: FN04
acpitz0 at acpi0: critical temperature is 106 degC
acpitz1 at acpi0: critical temperature is 106 degC
acpibat0 at acpi0: BAT0 not present
acpibat1 at acpi0: BAT1 not present
acpibat2 at acpi0: BAT2 not present
acpibtn0 at acpi0: PWRB
acpibtn1 at acpi0: LID0
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: DD02
cpu0: Enhanced SpeedStep 3606 MHz: speeds: 3501, 3500, 3400, 3200, 3100,
3000, 2800, 2700, 2500, 2400, 2300, 2100, 2000, 1900, 1700, 1600 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel Xeon E3-1200v2 Host" rev 0x09
ppb0 at pci0 dev 1 function 0 "Intel Xeon E3-1200v2 PCIE" rev 0x09: msi
pci1 at ppb0 bus 1
ppb1 at pci1 dev 0 function 0 vendor "PLX", unknown product 0x8747 rev 0xba
pci2 at ppb1 bus 2
ppb2 at pci2 dev 8 function 0 vendor "PLX", unknown product 0x8747 rev
0xba: msi
pci3 at ppb2 bus 4
ppb3 at pci2 dev 16 function 0 vendor "PLX", unknown product 0x8747 rev
0xba: msi
pci4 at ppb3 bus 3
vga1 at pci0 dev 2 function 0 "Intel HD Graphics 4000" rev 0x09
intagp0 at vga1
agp0 at intagp0: aperture at 0xd0000000, size 0x10000000
inteldrm0 at vga1
drm0 at inteldrm0
inteldrm0: 1680x1050
wsdisplay0 at vga1 mux 1: console (std, vt100 emulation)
wsdisplay0: screen 1-5 added (std, vt100 emulation)
"Intel 7 Series xHCI" rev 0x04 at pci0 dev 20 function 0 not configured
"Intel 7 Series MEI" rev 0x04 at pci0 dev 22 function 0 not configured
em0 at pci0 dev 25 function 0 "Intel 82579V" rev 0x04: msi, address
c8:60:00:cc:47:7d
ehci0 at pci0 dev 26 function 0 "Intel 7 Series USB" rev 0x04: apic 2 int 16
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
azalia0 at pci0 dev 27 function 0 "Intel 7 Series HD Audio" rev 0x04: msi
azalia0: codecs: Realtek/0x0899, Intel/0x2806, using Realtek/0x0899
audio0 at azalia0
ppb4 at pci0 dev 28 function 0 "Intel 7 Series PCIE" rev 0xc4: msi
pci5 at ppb4 bus 5
ppb5 at pci0 dev 28 function 4 "Intel 7 Series PCIE" rev 0xc4: msi
pci6 at ppb5 bus 51
ahci0 at pci6 dev 0 function 0 vendor "Marvell", unknown product 0x9230
rev 0x10: msi, AHCI 1.2
scsibus0 at ahci0: 32 targets
sd0 at scsibus0 targ 0 lun 0: <ATA, ST3000DM001-9YN1, CC4B> SCSI3
0/direct fixed naa.5000c500525bf426
sd0: 2861588MB, 512 bytes/sector, 5860533168 sectors
sd1 at scsibus0 targ 1 lun 0: <ATA, ST3000DM001-9YN1, CC4B> SCSI3
0/direct fixed naa.5000c5005265ff15
sd1: 2861588MB, 512 bytes/sector, 5860533168 sectors
sd2 at scsibus0 targ 2 lun 0: <ATA, ST3000DM001-9YN1, CC4B> SCSI3
0/direct fixed naa.5000c5004a5baa2e
sd2: 2861588MB, 512 bytes/sector, 5860533168 sectors
sd3 at scsibus0 targ 3 lun 0: <ATA, ST3000DM001-9YN1, CC4B> SCSI3
0/direct fixed naa.5000c5004a6e56f1
sd3: 2861588MB, 512 bytes/sector, 5860533168 sectors
uk0 at scsibus0 targ 7 lun 0: <Marvell, Console, 1.01> ATAPI 3/processor
removable
ppb6 at pci0 dev 28 function 6 "Intel 7 Series PCIE" rev 0xc4: msi
pci7 at ppb6 bus 52
ppb7 at pci7 dev 0 function 0 vendor "PLX", unknown product 0x8608 rev 0xba
pci8 at ppb7 bus 53
ppb8 at pci8 dev 1 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci9 at ppb8 bus 54
vendor "Broadcom", unknown product 0x4359 (class network subclass
miscellaneous, rev 0x00) at pci9 dev 0 function 0 not configured
ppb9 at pci8 dev 4 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci10 at ppb9 bus 55
ppb10 at pci8 dev 5 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci11 at ppb10 bus 56
ahci1 at pci11 dev 0 function 0 vendor "ASMedia", unknown product 0x0612
rev 0x01: msi, AHCI 1.2
scsibus1 at ahci1: 32 targets
ppb11 at pci8 dev 7 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci12 at ppb11 bus 57
"ASMedia ASM1042 xHCI" rev 0x00 at pci12 dev 0 function 0 not configured
ppb12 at pci8 dev 8 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci13 at ppb12 bus 58
ppb13 at pci8 dev 9 function 0 vendor "PLX", unknown product 0x8608 rev
0xba: msi
pci14 at ppb13 bus 59
em1 at pci14 dev 0 function 0 "Intel PRO/1000 (82583V)" rev 0x00: msi,
address c8:60:00:cc:4b:65
ehci1 at pci0 dev 29 function 0 "Intel 7 Series USB" rev 0x04: apic 2 int 23
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 "Intel EHCI root hub" rev 2.00/1.00 addr 1
pcib0 at pci0 dev 31 function 0 "Intel Z77 LPC" rev 0x04
ahci2 at pci0 dev 31 function 2 "Intel 7 Series AHCI" rev 0x04: msi,
AHCI 1.3
scsibus2 at ahci2: 32 targets
sd4 at scsibus2 targ 0 lun 0: <ATA, OCZ-VERTEX4, 1.4> SCSI3 0/direct
fixed naa.5e83a97ba7b2fd30
sd4: 122104MB, 512 bytes/sector, 250069680 sectors, thin
sd5 at scsibus2 targ 1 lun 0: <ATA, M4-CT064M4SSD1, 0309> SCSI3 0/direct
fixed naa.500a0751032e95ec
sd5: 61057MB, 512 bytes/sector, 125045424 sectors, thin
sd6 at scsibus2 targ 2 lun 0: <ATA, ST31500341AS, CC1H> SCSI3 0/direct
fixed naa.5000c50019d9277e
sd6: 1430799MB, 512 bytes/sector, 2930277168 sectors
cd0 at scsibus2 targ 4 lun 0: <ASUS, DRW-24B1ST c, 1.05> ATAPI 5/cdrom
removable
sd7 at scsibus2 targ 5 lun 0: <ATA, LITEONIT LMT-32L, LWS2> SCSI3
0/direct fixed naa.5000000000000000
sd7: 30533MB, 512 bytes/sector, 62533296 sectors, thin
ichiic0 at pci0 dev 31 function 3 "Intel 7 Series SMBus" rev 0x04: apic
2 int 18
iic0 at ichiic0
spdmem0 at iic0 addr 0x50: 4GB DDR3 SDRAM PC3-10600
spdmem1 at iic0 addr 0x51: 4GB DDR3 SDRAM PC3-10600
spdmem2 at iic0 addr 0x52: 4GB DDR3 SDRAM PC3-10600
spdmem3 at iic0 addr 0x53: 4GB DDR3 SDRAM PC3-10600
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
mtrr: Pentium Pro MTRR support
uhub2 at uhub0 port 1 "Intel Rate Matching Hub" rev 2.00/0.00 addr 2
ugen0 at uhub2 port 1 "Broadcom Corp BCM20702A0" rev 2.00/1.12 addr 3
uhub3 at uhub1 port 1 "Intel Rate Matching Hub" rev 2.00/0.00 addr 2
uhidev0 at uhub3 port 2 configuration 1 interface 0 "Logitech USB
Optical Mouse" rev 2.00/43.01 addr 3
uhidev0: iclass 3/1
ums0 at uhidev0: 3 buttons, Z dir
wsmouse0 at ums0 mux 0
uhidev1 at uhub3 port 5 configuration 1 interface 0 "BTC USB Multimedia
Cordless Kit" rev 1.10/2.12 addr 4
uhidev1: iclass 3/1
ukbd0 at uhidev1: 8 variable keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev2 at uhub3 port 5 configuration 1 interface 1 "BTC USB Multimedia
Cordless Kit" rev 1.10/2.12 addr 4
uhidev2: iclass 3/1, 4 report ids
uhid0 at uhidev2 reportid 1: input=7, output=0, feature=5
uhid1 at uhidev2 reportid 2: input=1, output=0, feature=0
uhid2 at uhidev2 reportid 3: input=7, output=0, feature=7
ums1 at uhidev2 reportid 4: 3 buttons, Z dir
wsmouse1 at ums1 mux 0
vscsi0 at root
scsibus3 at vscsi0: 256 targets
softraid0 at root
scsibus4 at softraid0: 256 targets
sd8 at scsibus4 targ 1 lun 0: <OPENBSD, SR RAID 1, 005> SCSI2 0/direct fixed
sd8: 2861588MB, 512 bytes/sector, 5860532576 sectors
sd9 at scsibus4 targ 2 lun 0: <OPENBSD, SR RAID 1, 005> SCSI2 0/direct fixed
sd9: 2861588MB, 512 bytes/sector, 5860532576 sectors
root on sd7a (02cd5138e0a82b6c.a) swap on sd7b dump on sd7b
softraid0: incorrect key or passphrase
sd10 at scsibus4 targ 3 lun 0: <OPENBSD, SR CRYPTO, 005> SCSI2 0/direct
fixed
sd10: 13978MB, 512 bytes/sector, 28627319 sectors
sd11 at scsibus4 targ 4 lun 0: <OPENBSD, SR CRYPTO, 005> SCSI2 0/direct
fixed
sd11: 524285MB, 512 bytes/sector, 1073735977 sectors
--
Scott McEachern
https://www.blackstaff.ca
"Those who would give up essential liberty to purchase a little temporary safety
deserve neither liberty nor safety." -- Benjamin Franklin
