patch for 10.x [1/2]
Stefan Wendler
stefan.wendler at tngtech.com
Fri Apr 1 15:16:26 UTC 2016
On 03/30/2016 12:56, Masachika ISHIZUKA wrote:
>>>> The i915 update is now in HEAD as of r296548:
>>
>> It is worked with 10.3-RC2 on my dell xps12.
>
> I missed drm_mem_util.h patch.
> Corrected and updated(r297231) patch is uploaded as follow.
>
> http://www17.plala.or.jp/ish-org/i915-patch-r297231-for-10.x.tar.xz
>
Hi,
unfortunately I get the following error in FreeBSD 10.3-RELEASE #0 r297264
--------
root at hactar:/u/s/s/m/d/i915kms# make
Warning: Object directory not changed from original
/usr/src/sys/modules/drm2/i915kms
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE
-nostdinc -I. -I@ -I@/contrib/altq -fno-common
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -mno-aes -mno-avx
-mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float
-fno-asynchronous-unwind-tables -ffreestanding -fstack-protector
-std=iso9899:1999 -Qunused-arguments -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 -Wno-error-tautological-compare
-Wno-error-empty-body -Wno-error-parentheses-equality
-Wno-error-unused-function -c
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c -o
i915_dma.o
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:63:33:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
return intel_read_status_page(LP_RING(dev_priv), reg);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:101:35:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
struct intel_ring_buffer *ring = LP_RING(dev_priv);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:134:35:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
struct intel_ring_buffer *ring = LP_RING(dev_priv);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:156:35:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
struct intel_ring_buffer *ring = LP_RING(dev_priv);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:219:7:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
if (LP_RING(dev_priv)->obj != NULL) {
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:252:35:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
struct intel_ring_buffer *ring = LP_RING(dev_priv);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:387:34:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
if ((dwords+1) * sizeof(int) >= LP_RING(dev_priv)->size - 8)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:390:2:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
BEGIN_LP_RING((dwords+1)&~1);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:44:19:
note: expanded from macro 'BEGIN_LP_RING'
intel_ring_begin(LP_RING(dev_priv), (n))
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:401:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(cmd);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:408:4:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(cmd);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:413:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(0);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:415:2:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
ADVANCE_LP_RING();
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:50:21:
note: expanded from macro 'ADVANCE_LP_RING'
intel_ring_advance(LP_RING(dev_priv))
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:448:9:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
ret = BEGIN_LP_RING(4);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:44:19:
note: expanded from macro 'BEGIN_LP_RING'
intel_ring_begin(LP_RING(dev_priv), (n))
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:452:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:453:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING((box->x1 & 0xffff) | (box->y1 << 16));
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:454:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(((box->x2 - 1) & 0xffff) | ((box->y2 - 1) << 16));
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:455:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(DR4);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:457:9:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
ret = BEGIN_LP_RING(6);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:44:19:
note: expanded from macro 'BEGIN_LP_RING'
intel_ring_begin(LP_RING(dev_priv), (n))
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:461:3:
error: no member named 'ring' in 'struct drm_i915_private'; did you mean
'rings'?
OUT_RING(GFX_OP_DRAWRECT_INFO);
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:47:18:
note: expanded from macro 'OUT_RING'
intel_ring_emit(LP_RING(dev_priv), x)
^
/usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_dma.c:41:56:
note: expanded from macro 'LP_RING'
#define LP_RING(d) (&((struct drm_i915_private *)(d))->ring[RCS])
^
@/dev/drm2/i915/i915_drv.h:313:27: note: 'rings' declared here
struct intel_ring_buffer rings[I915_NUM_RINGS];
^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
*** Error code 1
Stop.
make: stopped in /usr/src/sys/modules/drm2/i915kms
------
More information about the freebsd-x11
mailing list