Pending MFC of drm updates

Torfinn Ingolfsen torfinn.ingolfsen at
Tue Jan 6 17:17:28 PST 2009

On Wed, 07 Jan 2009 01:24:57 +0100
Torfinn Ingolfsen <torfinn.ingolfsen at> wrote:

I forgot to tell that I fixed the Makefile in sys/modules/drm/i915

> Apparently patch gets confuseed when it finds a file with the same
> name in the current directory (which was /usr/src), or perhaps I
> don't know how to tell patch how to find the right file.
> I just did:
> cd /usr/src
> patch < /dir/name/patchfile
> Anyway, a 'make kernel' fails:

Which is no wonder, because patch misplaced more files:
root at kg-v2# pwd
root at kg-v2# ll *.c *c.orig *.h *h.orig
-rw-r--r--  1 root  wheel   1650 Jan  7 01:09 drm_internal.h
-rw-r--r--  1 root  wheel      0 Jan  7 01:09 drm_internal.h.orig
-rw-r--r--  1 root  wheel  16455 Jan  7 01:09 i915_suspend.c
-rw-r--r--  1 root  wheel      0 Jan  7 01:09 i915_suspend.c.orig
-rw-r--r--  1 root  wheel  59118 Jan  7 01:09 radeon_microcode.h
-rw-r--r--  1 root  wheel      0 Jan  7 01:09 radeon_microcode.h.orig

Is ther a "secret handshake" to make patch put the files in their
correct place? (Except for reading through the whole patchfile to
determine if all touched filews are in the same directory.)

For now I just mv'ed the files into place.
Anyway, now the new kernel builds, installs and works correctly.
It didn't pick up any drm, but I'm not sure that it should either. This
machine[1] has a GeForce 8200 chipset. More info about FreeBSD on this
machine here[2], including dmesgs before and after, etc.


Torfinn Ingolfsen

More information about the freebsd-stable mailing list