Re: X220 and all.14.5.patch

On 05/03/12 22:12, Artem Tuchinsky wrote:
> it's russian, not greek :) and this is my posts. Try to remove
> /usr/src and checkout clean source before applying patch, it helped
> me. And check FAQ, paragraphs 7 and 8 -
> http://wiki.freebsd.org/Intel_GPU
>
> sorry for my bad english
>
> 2012/5/4 Erich Dollansky<erichfreebsdlist_at_ovitrap.com>:
>> Hi,
>>
>> I just applied this patch and tried to compile getting this error:
>>
>> /usr/src/sys/dev/drm/i915_mem.c:216: warning: no previous prototype for 'i915_mem_release' [-Wmissing-prototypes]
>> /usr/src/sys/dev/drm/i915_mem.c:246: warning: no previous prototype for 'i915_mem_takedown' [-Wmissing-prototypes]
>> /usr/src/sys/dev/drm/i915_mem.c: In function 'get_heap':
>> /usr/src/sys/dev/drm/i915_mem.c:266: error: 'drm_i915_private_t' has no member named 'agp_heap'
>> /usr/src/sys/dev/drm/i915_mem.c: At top level:
>> /usr/src/sys/dev/drm/i915_mem.c:276: warning: no previous prototype for 'i915_mem_alloc' [-Wmissing-prototypes]
>> /usr/src/sys/dev/drm/i915_mem.c:314: warning: no previous prototype for 'i915_mem_free' [-Wmissing-prototypes]
>> /usr/src/sys/dev/drm/i915_mem.c:342: warning: no previous prototype for 'i915_mem_init_heap' [-Wmissing-prototypes]
>> /usr/src/sys/dev/drm/i915_mem.c:366: warning: no previous prototype for 'i915_mem_destroy_heap' [-Wmissing-prototypes]
>> *** [i915_mem.o] Error code 1
>>
>> I found this:
>>
>> http://pastebin.com/ySPxJNUF
>>
>> and
>>
>> http://www.linux.org.ru/news/bsd/7658822/page6
>>
>> which is a bit like Greek for me.
>>
>> It would be easy to fix the prototype errors. Does anybody know what agp_heap is all about?
>>
>> The machine:
>>
>> FreeBSD X220.ovitrap.com 10.0-CURRENT FreeBSD 10.0-CURRENT #4: Wed May  2 06:59:48 WIT 2012     erich_at_X220.ovitrap.com:/usr/obj/usr/src/sys/X220  amd64
>>
>> Erich
>
>
Is it possibly that the patch got applied twice? I had some errors a 
while back that were resulting from an inconsistent mixture of 
pre-patch, post-patch and double patched files...I deleted /usr/src and 
followed the patching instructions after doing a fresh csup. There is 
also (or was) some sed command that fixes some issues in the files that 
must not be skipped due to cvs tags. Don't forget to rm /usr/obj.

Matt