1 --- src/i830_dri.h Thu May 6 15:35:08 2010 |
|
2 +++ src/i830_dri.h Thu May 6 15:38:23 2010 |
|
3 @@ -21,16 +21,20 @@ |
|
4 drm_handle_t unused2; /* backbuffer */ |
|
5 |
|
6 drmSize unused3; /* depthbufferSize */ |
|
7 + drmSize pad0; |
|
8 drm_handle_t unused4; /* depthbuffer */ |
|
9 |
|
10 drmSize unused5; /* rotatedSize / */ |
|
11 + drmSize pad1; |
|
12 drm_handle_t unused6; /* rotatedbuffer */ |
|
13 |
|
14 drm_handle_t unused7; /* textures */ |
|
15 int unused8; /* textureSize */ |
|
16 + drmSize pad2; |
|
17 |
|
18 drm_handle_t unused9; /* agp_buffers */ |
|
19 drmSize unused10; /* agp_buf_size */ |
|
20 + drmSize pad3; |
|
21 |
|
22 int deviceID; |
|
23 int width; |
|
24 --- src/i830_common.h Thu May 6 15:35:04 2010 |
|
25 +++ src/i830_common.h Thu May 6 15:39:11 2010 |
|
26 @@ -90,6 +90,7 @@ |
|
27 int pf_current_page; /* which buffer is being displayed? */ |
|
28 int perf_boxes; /* performance boxes to be displayed */ |
|
29 int width, height; /* screen size in pixels */ |
|
30 + int pad0; |
|
31 |
|
32 drm_handle_t front_handle; |
|
33 int front_offset; |
|
34 @@ -128,6 +129,8 @@ |
|
35 int pipeB_y; |
|
36 int pipeB_w; |
|
37 int pipeB_h; |
|
38 + |
|
39 + int pad1; |
|
40 |
|
41 /* Triple buffering */ |
|
42 drm_handle_t third_handle; |
|
43 --- src/i830_batchbuffer.h Thu May 6 15:37:39 2010 |
|
44 +++ src/i830_batchbuffer.h Thu May 6 15:40:34 2010 |
|
45 @@ -30,9 +30,9 @@ |
|
46 #ifndef _INTEL_BATCHBUFFER_H |
|
47 #define _INTEL_BATCHBUFFER_H |
|
48 |
|
49 -#define BATCH_RESERVED 16 |
|
50 +#define BATCH_RESERVED4k 4096 |
|
51 +#define BATCH_RESERVED16 16 |
|
52 |
|
53 - |
|
54 void intel_batch_init(ScrnInfoPtr scrn); |
|
55 void intel_batch_teardown(ScrnInfoPtr scrn); |
|
56 void intel_batch_emit_flush(ScrnInfoPtr scrn); |
|
57 @@ -41,7 +41,10 @@ |
|
58 |
|
59 static inline int intel_batch_space(intel_screen_private *intel) |
|
60 { |
|
61 - return (intel->batch_bo->size - BATCH_RESERVED) - (intel->batch_used); |
|
62 + if (IS_I865G(intel)) |
|
63 + return (intel->batch_bo->size - BATCH_RESERVED16) - (intel->batch_used); |
|
64 + else |
|
65 + return (intel->batch_bo->size - BATCH_RESERVED4k) - (intel->batch_used); |
|
66 } |
|
67 |
|
68 static inline void |
|
69 --- src/i830_driver.c Thu May 6 15:39:02 2010 |
|
70 +++ src/i830_driver.c Thu May 6 15:42:54 2010 |
|
71 @@ -1500,6 +1500,8 @@ |
|
72 if (!i830_bind_all_memory(scrn)) |
|
73 return FALSE; |
|
74 |
|
75 + scrn->vtSema = TRUE; |
|
76 + |
|
77 i830_describe_allocations(scrn, 1, ""); |
|
78 |
|
79 intel_batch_init(scrn); |
|