Ver 2 of the patch [was: Re: i915 driver update testing]

[Ranjan1018 .]

2014-10-07 20:01 GMT+02:00 Konstantin Belousov <kostikbel at gmail.com>:

> On Tue, Oct 07, 2014 at 07:44:19PM +0300, Konstantin Belousov wrote:
> > >From the same frame, please do
> > p *(struct drm_i915_private *)(dev->private)
>
> I probably figured out what is wrong, but it is still interesting to
> see this piece of data.
>
> For everybody who has the issue with blank screen or panic after
> the patch:
> 1. please try the updated patch,
>         https://www.kib.kiev.ua/kib/drm/i915.2.patch
> 2. if you use "kldload i915kms" to test the patch and get the blank
>    screen, verify do you get panic or just a black screen.  It is
>    expected for sc, not so for vt.  For vt, if you do get blank screen
>    and not a panic, do not load i915kms manually and run the X server.
>    I am interested if running X server does show proper output.
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"
>

Hi,

applying the patch I receive this message:
# patch -p1 -C < ~/downloads/i915.2.patch
.
.
.
Patching file sys/amd64/amd64/pmap.c using Plan A...
Hunk #1 succeeded at 1710.
Hunk #2 succeeded at 6226.
Hunk #3 succeeded at 6562.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/amd64/conf/X b/sys/amd64/conf/X
|index 0cd80c6..2d630d5 100644
|--- a/sys/amd64/conf/X
|+++ b/sys/amd64/conf/X
--------------------------
File to patch:

I haven't the file X.

Regards,
Maurizio