Date: Wed, 7 Jan 2015 09:54:43 +0100 From: Michael Gmelin <freebsd@grem.de> To: Andrey Fesenko <f0andrey@gmail.com> Cc: freebsd-x11@freebsd.org Subject: Re: Testing i915kms/Haswell on Intel 4th generation grpahics Message-ID: <20150107095443.2ac900e4@bsd64.grem.de> In-Reply-To: <CA%2BK5SrOzrzw8WoKLL_eQgUx-OsDjDNBBhsxZVsSGk8%2Bnipm-Fg@mail.gmail.com> References: <20150106044154.50171e38@bsd64.grem.de> <CA%2BK5SrOzrzw8WoKLL_eQgUx-OsDjDNBBhsxZVsSGk8%2Bnipm-Fg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--MP_/9k9nZ5QVUVOYqL0r7IrzXmr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wed, 7 Jan 2015 08:05:16 +0400 Andrey Fesenko <f0andrey@gmail.com> wrote: > On Tue, Jan 6, 2015 at 6:41 AM, Michael Gmelin <freebsd@grem.de> > wrote: > > Hi, > > > > I took kib's patches from https://www.kib.kiev.ua/kib/drm/ and > > merged them into CURRENT (a couple of changes in vm). I also added > > my chipset id to pciids, i915 and agp. > > > > The merged/updated patch can be found here: > > > > http://blog.grem.de/bits/haswellgfx_20150106.patch > > > > You patch not contain i915_gem_stolen.c, intel_ddi.c, intel_pm.c and > not build, this files exist > https://www.kib.kiev.ua/kib/drm/i915.8.patch > > I'm have i5-4570 > pciconf > vgapci0@pci0:0:2:0: class=0x030000 card=0xd0001458 chip=0x04128086 > rev=0x06 hdr=0x00 > vendor = 'Intel Corporation' > device = 'Haswell Integrated Graphics Controller' > class = display > subclass = VGA > bar [10] = type Memory, range 64, base 0xf0000000, size > 4194304, enabled bar [18] = type Prefetchable Memory, range 64, > base 0xe0000000, size 268435456, enabled > bar [20] = type I/O Port, range 32, base 0xf000, size 64, > enabled cap 05[90] = MSI supports 1 message > cap 01[d0] = powerspec 2 supports D0 D3 current D0 > cap 13[a4] = PCI Advanced Features: FLR TP > > If after rebuild kernel and restart, set drm.debug=2 and kldload > i915kms system crushed. Thank you for pointing this out, I corrected the patch to contain these files as well. Style aside, it basically results in the same code as kib's patch, so it's redundant now. The only differences are PCI Ids for chipsets that are not supported yet (that's what I was testing), I attached a patch for those. - Michael -- Michael Gmelin --MP_/9k9nZ5QVUVOYqL0r7IrzXmr Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=haswell_pciids.patch diff -ruN a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c --- a/sys/dev/agp/agp_i810.c 2015-01-06 01:05:42.000000000 +0100 +++ b/sys/dev/agp/agp_i810.c 2015-01-07 09:37:14.705584056 +0100 @@ -797,16 +797,6 @@ .driver = &agp_i810_hsw_driver }, { - .devid = 0x0a068086, - .name = "Haswell ULT", - .driver = &agp_i810_hsw_driver - }, - { - .devid = 0x0a268086, - .name = "Haswell ULP", - .driver = &agp_i810_hsw_driver - }, - { .devid = 0, } }; diff -ruN a/sys/dev/drm2/drm_pciids.h b/sys/dev/drm2/drm_pciids.h --- a/sys/dev/drm2/drm_pciids.h 2015-01-06 01:06:15.000000000 +0100 +++ b/sys/dev/drm2/drm_pciids.h 2015-01-07 09:38:56.481580099 +0100 @@ -55,8 +55,6 @@ {0x8086, 0x0406, CHIP_I9XX|CHIP_I915, "Intel Haswell (M)"}, \ {0x8086, 0x0416, CHIP_I9XX|CHIP_I915, "Intel Haswell (M)"}, \ {0x8086, 0x0c16, CHIP_I9XX|CHIP_I915, "Intel Haswell (SDV)"}, \ - {0x8086, 0x0a06, CHIP_I9XX|CHIP_I915, "Intel Haswell (ULT)"}, \ - {0x8086, 0x0a26, CHIP_I9XX|CHIP_I915, "Intel Haswell (ULV)"}, \ {0x8086, 0x2562, CHIP_I8XX, "Intel i845G GMCH"}, \ {0x8086, 0x2572, CHIP_I8XX, "Intel i865G GMCH"}, \ {0x8086, 0x2582, CHIP_I9XX|CHIP_I915, "Intel i915G"}, \ diff -ruN a/sys/dev/drm2/i915/i915_drv.c b/sys/dev/drm2/i915/i915_drv.c --- a/sys/dev/drm2/i915/i915_drv.c 2015-01-06 02:13:10.000000000 +0100 +++ b/sys/dev/drm2/i915/i915_drv.c 2015-01-07 09:38:56.505578713 +0100 @@ -279,8 +279,6 @@ INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */ INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */ INTEL_VGA_DEVICE(0x0c16, &intel_haswell_d_info), /* SDV */ - INTEL_VGA_DEVICE(0x0a06, &intel_haswell_d_info), /* UDT */ - INTEL_VGA_DEVICE(0x0a26, &intel_haswell_d_info), /* UDV */ {0, 0} }; --MP_/9k9nZ5QVUVOYqL0r7IrzXmr--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150107095443.2ac900e4>