Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

classic Classic list List threaded Threaded
30 messages Options
12
Reply | Threaded
Open this post in threaded view
|

Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

meowthink
Hello all,

I think head and stable/9 are nearly same (to kib's patch) nowadays,
hence I didn't post a 13.1 one after kib made it.
The only problem is for releng/9_0 users, whose branch is a bit far
behind. Though I don't think releng users are eager to test such a
highly experiment patch, I've heard somebody maintaining patches for,
available at http://tsatsenko.ru/files/

to Jakub:
Your problem is clearly figured out by Xorg: It couldn't communicate
with DRM, a part of kernel, which Intel GPU patch heavily modified.
So,
1. Check if the patch is applied clearly.
2. If so, try using gcc in base to compile kernel.

to Warren,
Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
patch(or try to deal with svn:keywords).
And ... I don't know why you got those Makefiles rejected, as they
were there, not modified in the official repository, for quite a long
time. Any detail?

Anyway, I generated a 13.1 diff for stable/9 tree:
https://docs.google.com/open?id=0BxbPi2OX4_B-ZTViYTU4NmQtNjM4MC00ZTM5LTk1N2ItZGVlODQzNTI0OTE4

Good luck,
Meowthink
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
Doing fresh co just in case + applying 13.1, will see.
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
Indeed,

|diff --git a/stable/9/sys/modules/drm/drm/Makefile b/stable/9/sys/modules/drm/drm/Makefile
|--- a/stable/9/sys/modules/drm/drm/Makefile    (revision 230718)
|+++ b/stable/9/sys/modules/drm/drm/Makefile    (working copy)
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 8.
1 out of 1 hunks failed--saving rejects to Makefile.rej

$ find /usr/src/* -name '*rej'

/usr/src/Makefile.rej

rest of patch applied cleanly.
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Mirosław Nagaś
In reply to this post by Jakub Lach
On Tue, 7 Feb 2012 07:46:43 -0800 (PST)
Jakub Lach <[hidden email]> wrote:

> Doing fresh co just in case + applying 13.1, will see.

Unfortunately I can confirm the problem. Did svn co (stable/9), applied
13.1 patch successfully (sys/modules/drm/i915/Makefile rejected so i
made these changes manually), rebuilt world with kernel, and faced such
a problem:

# kldload drm
kldload: can't load drm: Exec format error

I had the same problem yesterday (with 13.0 diff).
I can provide full typescript of that terminal session.


/mn
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
In reply to this post by Jakub Lach
$ find /usr/src/* -name '*rej*'                                            
/usr/src/Makefile.rej
/usr/src/Makefile.rej.orig

With clean source.
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Warren Block
In reply to this post by meowthink
On Tue, 7 Feb 2012, Meowthink wrote:

> to Warren,
> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
> patch(or try to deal with svn:keywords).
> And ... I don't know why you got those Makefiles rejected, as they
> were there, not modified in the official repository, for quite a long
> time. Any detail?

It's the path for the first two Makefiles.  Or something about patch,
maybe:

   # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/ /usr/src/sys/dev/drm/i915_suspend.c
   # cd /usr/src
   # patch < drm-all.13.1-stable9.1.patch

fails.  But this works:

   # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/ /usr/src/sys/dev/drm/i915_suspend.c
   # cd /usr/src/sys
   # patch -p1 < drm-all.13.1-stable9.1.patch
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Warren Block
On Tue, 7 Feb 2012, Warren Block wrote:

> On Tue, 7 Feb 2012, Meowthink wrote:
>
>> to Warren,
>> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
>> patch(or try to deal with svn:keywords).
>> And ... I don't know why you got those Makefiles rejected, as they
>> were there, not modified in the official repository, for quite a long
>> time. Any detail?
>
> It's the path for the first two Makefiles.  Or something about patch, maybe:
>
>  # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/
> /usr/src/sys/dev/drm/i915_suspend.c
>  # cd /usr/src
>  # patch < drm-all.13.1-stable9.1.patch
>
> fails.  But this works:
>
>  # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/
> /usr/src/sys/dev/drm/i915_suspend.c
>  # cd /usr/src/sys
>  # patch -p1 < drm-all.13.1-stable9.1.patch

And now it's really unhappy about duplicate definitions.  This is from a
buildkernel:

Warning: Object directory not changed from original /usr/src/sys/modules/drm/drm
/usr/local/libexec/ccache/world/cc -O2 -pipe -march=prescott -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc   -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common   -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse -mno-mmx -msoft-float -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions  -Wmissing-include-dirs -fdiagnostics-show-option   -c /usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3343: error: redefinition of 'struct drm_prop_enum_list'
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3363: error: redefinition of 'drm_dpms_enum_list'
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:59: error: previous definition of 'drm_dpms_enum_list' was here
...(about 1900 lines)
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3230: error: previous definition of 'drm_mode_destroy_dumb_ioctl' was here
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:36285: error: redefinition of 'drm_fb_get_bpp_depth'
/usr/src/sys/modules/drm/drm/../../../dev/drm/drm_crtc.c:3245: error: previous definition of 'drm_fb_get_bpp_depth' was here
*** Error code 1

Stop in /usr/src/sys/modules/drm/drm.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
Hi.

Thanks to Warren's pointers, dri/KMS is working now and happily spamming
syslog (yup, I had rejections with those Makefiles, and I missed them).

How to disable sync to monitor refresh now? It's igonoring my old
driconf.
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
[drm:KMS:pid20532:intel_crtc_cursor_set]
[drm:KMS:pid20532:intel_crtc_cursor_set] cursor off

ad infinitum
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
$ kldstat

<...>

 3    1 0xffffffff80c12000 58cb1    i915.ko
 4    1 0xffffffff80c6b000 2be03    drm.ko
 5    4 0xffffffff80c97000 10e8     iicbus.ko
 6    1 0xffffffff80c99000 cc0      iic.ko
 7    1 0xffffffff80c9a000 1185     iicbb.ko

Could be good idea to include some addnotation,
that dri now requires i2c.
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
$ export vblank_mode=0                                              
$ glxgears                                                          
ATTENTION: default value of option vblank_mode overridden by environment.
ATTENTION: default value of option vblank_mode overridden by environment.
ATTENTION: option value of option vblank_mode ignored.
5959 frames in 5.0 seconds = 1191.756 FPS
5999 frames in 5.0 seconds = 1199.797 FPS
6005 frames in 5.0 seconds = 1200.886 FPS
6011 frames in 5.0 seconds = 1202.070 FPS
6019 frames in 5.0 seconds = 1202.387 FPS

Well, looks like it works. Bit faster too. I miss switching to system console though.

PS. Still looking for valid vblank_mode option for .drirc
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Warren Block
In reply to this post by Warren Block
On Tue, 7 Feb 2012, Warren Block wrote:

> On Tue, 7 Feb 2012, Meowthink wrote:
>
>> to Warren,
>> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
>> patch(or try to deal with svn:keywords).
>> And ... I don't know why you got those Makefiles rejected, as they
>> were there, not modified in the official repository, for quite a long
>> time. Any detail?
>
> But this works:
>

Erred pasting that:

# sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/' /usr/src/sys/dev/drm/i915_suspend.c

>  # cd /usr/src/sys
>  # patch -p1 < drm-all.13.1-stable9.1.patch
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
Hi again.

In case someone would be in the same sitiuatuon as I, with dri2, to disable
vblank you need additional device "dri2" added in .drirc:

<driconf>
     <device screen="0" driver="dri2">
        <application name="Default">
            <option name="vblank_mode" value="0" />
        </application>
     </device>

(rest of file)

best regards,
- Jakub Lach





Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

meowthink
In reply to this post by Warren Block
Hello Warren,

It seems that your problem came from command line. Seems I chose a
style that not so friendly? Try patch by this way:

cd /path/of/src/
patch -p3 < /path/to/drm-all.13.1-stable9.1.patch

Or, my preferred way:

cd /path/of/src/
svn patch --strip 2 /path/to/drm-all.13.1-stable9.1.patch

The reason is that the working directory of my patch is set to svn
base, but typically we checkout svn /stable/9/ to /usr/src/, so
there's 2 levels of path to be stripped out. Unfortunately, this style
also differs from kib's. I'll try to match his next time.

Cheers,
Meowthink
On Wed, Feb 8, 2012 at 11:32 AM, Warren Block <[hidden email]> wrote:

> On Tue, 7 Feb 2012, Warren Block wrote:
>
>> On Tue, 7 Feb 2012, Meowthink wrote:
>>
>>> to Warren,
>>> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
>>> patch(or try to deal with svn:keywords).
>>> And ... I don't know why you got those Makefiles rejected, as they
>>> were there, not modified in the official repository, for quite a long
>>> time. Any detail?
>>
>>
>> But this works:
>>
>
> Erred pasting that:
>
>
> # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/'
> /usr/src/sys/dev/drm/i915_suspend.c
>
>>  # cd /usr/src/sys
>>  # patch -p1 < drm-all.13.1-stable9.1.patch
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Warren Block
On Wed, 8 Feb 2012, Meowthink wrote:

> Hello Warren,
>
> It seems that your problem came from command line. Seems I chose a
> style that not so friendly? Try patch by this way:
>
> cd /path/of/src/
> patch -p3 < /path/to/drm-all.13.1-stable9.1.patch

The patch applies (after the sed), but I'm still seeing the duplicated
files.  It's like the patch is doubled, so the kernel build errors out
on finding all the redefinitions.

This is 9stable as of today.  It's i386 on a netbook that does not
support amd64.

If there's some step I've missed, please let me know.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

meowthink
On Thu, Feb 9, 2012 at 2:39 PM, Warren Block <[hidden email]> wrote:

> On Wed, 8 Feb 2012, Meowthink wrote:
>
>> Hello Warren,
>>
>> It seems that your problem came from command line. Seems I chose a
>> style that not so friendly? Try patch by this way:
>>
>> cd /path/of/src/
>> patch -p3 < /path/to/drm-all.13.1-stable9.1.patch
>
>
> The patch applies (after the sed), but I'm still seeing the duplicated
> files.  It's like the patch is doubled, so the kernel build errors out on
> finding all the redefinitions.
>
> This is 9stable as of today.  It's i386 on a netbook that does not support
> amd64.
>
> If there's some step I've missed, please let me know.

Ooops. Seems like patch will simply append the context, when the
target file exists but the diff is made to /dev/null. Though am not
good at dealing with this, I think you can try:

svn revert -R .
svn st | grep '?' | awk {'print $2'} | xargs rm

to gets your local repository fresh/clean. Then do the patchwork all over again.

Maybe a little off-topic but do worth to discuss. Sorry for
inappropriate if any.
Meowthink
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Jakub Lach
Minor annoyance, upon starting libreoffice screen is not redrawn
partially (only on startup menu, documents load fine).
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Max Brazhnikov
In reply to this post by meowthink
On Tue, 7 Feb 2012 22:27:16 +0800, Meowthink wrote:
> Anyway, I generated a 13.1 diff for stable/9 tree:
> https://docs.google.com/open?id=0BxbPi2OX4_B-ZTViYTU4NmQtNjM4MC00ZTM5LTk1N2
> ItZGVlODQzNTI0OTE4

Patch applied cleanly (except aforementioned i915_suspend.c) for 9.0-STABLE
svnrev 231390. But new kernel fails to mount root on my zfs-only system:
mounting from zfs:pool failed with error 6

am I missing something?

Max
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

Max Brazhnikov
On Sun, 12 Feb 2012 10:55:59 +0800, Meowthink wrote:
> The patch did nothing zfs-related.
> I've seen changes to zfs[1] just before r231390. So, have you ever
> tried r231390 __before__ applied this patch?

yes, world and kernel have been updated to r231390 before playing with the
patch and I run r231390 now without any problem. I understand that the patch
has nothing about zfs, and it looks really weird, since I've just followed the
usual updating procedure.

> [1] http://svnweb.freebsd.org/base?view=revision&revision=231381
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)

stuckpig
In reply to this post by Warren Block
I updated to 9-STABLE today and applied meow's patch from 03.04.12 http://tsatsenko.ru/files/all.13.5-stable-9.patch (successfully), however i encounter the same errors as warren: building the kernel fails on drm_crtc.c-- any way to resolve this?
12