Date: Mon, 9 May 2016 19:42:21 +0200 From: Hans Petter Selasky <hps@selasky.org> To: Sergey Manucharian <sm@ara-ler.com>, freebsd-current@FreeBSD.org Subject: Re: i915kms broken at some commit between r296485 and r297692? Message-ID: <2839bf70-1300-86c6-4a0f-d23586e07015@selasky.org> In-Reply-To: <2368d5b7-3d3c-7057-0849-c3339ce90b25@selasky.org> References: <20160509023416.GA2375@dendrobates.araler.com> <2368d5b7-3d3c-7057-0849-c3339ce90b25@selasky.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------CD42C7D23835F1C61C5F1DFE Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 05/09/16 18:10, Hans Petter Selasky wrote: > On 05/09/16 04:34, Sergey Manucharian wrote: >> I'm running FreeBSD 11.0-CURRENT r292595 on ThinkPad T430 (i7-3520M, >> Intel video 4000). Today I tried to update to a fresher version. >> Something has been broken somewhere between r296485 and r297692, >> I suspect namely i915kms - it won't boot: at the boot screen I see that >> all modules are loaded, then after "Booting..." message at the bottom >> screen turns black in 1-2 seconds of booting process, it seems to be the >> point when it regularly switches to native resolution. >> >> Can somebody shed light on it? What can I check to get more info on >> this? >> >> Regularly I update to the revisions used to build snapshots at: >> >> ftp://ftp.freebsd.org/pub/FreeBSD/snapshots/ISO-IMAGES/11.0/ >> >> assuming that those revisions have less issues. So tried a few, including >> the head. None worked for me after a certain revision (from the range I >> mentioned above). >> >> Thanks for advices! > > Hi, > > I'm seeing the same thing with a MacBookPro. When loading drm2 and i915 > after boot, it works. I think it is something simple causing this failure. > > --HPS > Hi, Can you try the attached patch. Works for me. --HPS --------------CD42C7D23835F1C61C5F1DFE Content-Type: text/x-patch; name="drmfix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="drmfix.diff" diff --git a/sys/dev/drm2/i915/intel_drv.h b/sys/dev/drm2/i915/intel_drv.h index fd5817f..d9b01b8 100644 --- a/sys/dev/drm2/i915/intel_drv.h +++ b/sys/dev/drm2/i915/intel_drv.h @@ -50,6 +50,8 @@ pause((WMSG), 1); \ else \ DELAY(1000); \ + if (cold) \ + end -= howmany(hz, 1000); \ } \ \ ret; \ @@ -68,6 +70,8 @@ } else { \ DELAY(1000); \ } \ + if (cold) \ + timeout__ -= howmany(hz, 1000); \ } \ ret__; \ }) --------------CD42C7D23835F1C61C5F1DFE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2839bf70-1300-86c6-4a0f-d23586e07015>