← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-intel/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/101_copy-fb.patch

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-01-27 18:53:35 UTC
  • Revision ID: james.westby@ubuntu.com-20110127185335-fwi6dw0sbvpn3vcm
Tags: 2:2.14.0-1ubuntu3
debian/patches/101_copy-fb.patch: Fix 1.10 video ABI codepath

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/101_copy-fb.patch
1
1
Index: xserver-xorg-video-intel/src/intel.h
2
2
===================================================================
3
 
--- xserver-xorg-video-intel.orig/src/intel.h   2011-01-27 11:42:50.680785002 +1100
4
 
+++ xserver-xorg-video-intel/src/intel.h        2011-01-27 11:46:07.540785001 +1100
 
3
--- xserver-xorg-video-intel.orig/src/intel.h   2011-01-31 17:55:53.348189809 +1100
 
4
+++ xserver-xorg-video-intel/src/intel.h        2011-01-31 17:56:01.018201058 +1100
5
5
@@ -472,6 +472,7 @@
6
6
        OptionInfoPtr Options;
7
7
 
20
20
                              dri_bo *new_front,
21
21
Index: xserver-xorg-video-intel/src/intel_display.c
22
22
===================================================================
23
 
--- xserver-xorg-video-intel.orig/src/intel_display.c   2011-01-27 11:42:50.670785002 +1100
24
 
+++ xserver-xorg-video-intel/src/intel_display.c        2011-01-27 11:48:03.070785001 +1100
 
23
--- xserver-xorg-video-intel.orig/src/intel_display.c   2011-01-31 17:55:53.328189776 +1100
 
24
+++ xserver-xorg-video-intel/src/intel_display.c        2011-01-31 17:56:01.018201058 +1100
25
25
@@ -36,6 +36,8 @@
26
26
 #include <errno.h>
27
27
 #include <poll.h>
45
45
 
46
46
        for (i = 0; i < koutput->count_props; i++) {
47
47
                drmModePropertyPtr props;
48
 
@@ -1614,6 +1623,13 @@
 
48
@@ -1614,6 +1623,11 @@
49
49
        }
50
50
 
51
51
        intel->modes = mode;
52
52
+
53
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
54
 
+       srcn->pScreen->canDoBGNoneRoot = TRUE;
55
 
+#else
 
53
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 9
56
54
+       scrn->canDoBGNoneRoot = TRUE;
57
55
+#endif
58
56
+
59
57
        return TRUE;
60
58
 }
61
59
 
62
 
@@ -1684,3 +1700,101 @@
 
60
@@ -1684,3 +1698,101 @@
63
61
 {
64
62
        return crtc_id(crtc->driver_private);
65
63
 }
163
161
+
164
162
Index: xserver-xorg-video-intel/src/intel_driver.c
165
163
===================================================================
166
 
--- xserver-xorg-video-intel.orig/src/intel_driver.c    2011-01-27 11:42:50.690785002 +1100
167
 
+++ xserver-xorg-video-intel/src/intel_driver.c 2011-01-27 11:46:07.540785001 +1100
168
 
@@ -1018,6 +1018,8 @@
 
164
--- xserver-xorg-video-intel.orig/src/intel_driver.c    2011-01-31 17:55:53.358189820 +1100
 
165
+++ xserver-xorg-video-intel/src/intel_driver.c 2011-01-31 18:01:33.088688114 +1100
 
166
@@ -1008,6 +1008,10 @@
 
167
                intel->directRenderingType = DRI_DRI2;
 
168
 #endif
 
169
 
 
170
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
 
171
+       screen->canDoBGNoneRoot = TRUE;
 
172
+#endif
 
173
+
 
174
        if (!intel_init_initial_framebuffer(scrn))
 
175
                return FALSE;
 
176
 
 
177
@@ -1018,6 +1022,8 @@
169
178
        if (INTEL_INFO(intel)->gen >= 40)
170
179
                gen4_render_state_init(scrn);
171
180
 
174
183
        miClearVisualTypes();
175
184
        if (!miSetVisualTypes(scrn->depth,
176
185
                              miGetDefaultVisualMask(scrn->depth),
177
 
@@ -1153,6 +1155,7 @@
 
186
@@ -1153,6 +1159,7 @@
178
187
 
179
188
        intel_mode_init(intel);
180
189
 
182
191
        intel->suspended = FALSE;
183
192
 
184
193
 #if HAVE_UDEV
185
 
@@ -1222,6 +1225,8 @@
 
194
@@ -1222,6 +1229,8 @@
186
195
 
187
196
        intel_set_gem_max_sizes(scrn);
188
197