xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 8 +++-
debian/patches/101_copy-fb.patch | 76 +++++++--------------------------------
2 files changed, 21 insertions(+), 63 deletions(-)
New commits:
commit f79ffa7f4dfadab5f6fdc838472e68d994cf6c08
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Aug 9 11:52:25 2011 +1000
Release to oneiric
diff --git a/debian/changelog b/debian/changelog
index 5ce7326..b3f5c8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.15.901-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.15.901-1ubuntu1) oneiric; urgency=low
[ Robert Hooker ]
* Merge from debian-experimental, remaining changes:
commit 2864eb414d97f515c68f5a201305709711728d3b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Aug 9 10:19:47 2011 +1000
Refresh copy-fb for new upstream
diff --git a/debian/changelog b/debian/changelog
index 61e196d..5ce7326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xserver-xorg-video-intel (2:2.15.901-1ubuntu1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* Merge from debian-experimental, remaining changes:
- 101_copy-fb.patch
+ Plymouth integration patch
@@ -12,7 +13,10 @@ xserver-xorg-video-intel (2:2.15.901-1ubuntu1) UNRELEASED; urgency=low
* Dropped patches:
- 121_fdo-28798-fix.patch (upstream)
- -- Robert Hooker <sarvatt@ubuntu.com> Mon, 01 Aug 2011 12:20:10 -0400
+ [ Christopher James Halse Rogers ]
+ * Refresh 101_copy-fb.patch.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 09 Aug 2011 10:10:02 +1000
xserver-xorg-video-intel (2:2.15.901-1) experimental; urgency=low
diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index 5c38e34..c8c15cb 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-intel/src/intel.h
===================================================================
---- xserver-xorg-video-intel.orig/src/intel.h 2011-06-02 17:16:53.871343985 +1000
-+++ xserver-xorg-video-intel/src/intel.h 2011-06-02 17:16:59.491377184 +1000
-@@ -433,6 +433,7 @@
+--- xserver-xorg-video-intel.orig/src/intel.h 2011-08-08 11:07:56.000000000 +1000
++++ xserver-xorg-video-intel/src/intel.h 2011-08-08 11:08:50.721290693 +1000
+@@ -436,6 +436,7 @@
OptionInfoPtr Options;
/* Driver phase/state information */
@@ -10,7 +10,7 @@ Index: xserver-xorg-video-intel/src/intel.h
Bool suspended;
enum last_3d last_3d;
-@@ -462,6 +463,7 @@
+@@ -465,6 +466,7 @@
extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
extern int intel_crtc_id(xf86CrtcPtr crtc);
extern int intel_output_dpms_status(xf86OutputPtr output);
@@ -20,8 +20,8 @@ Index: xserver-xorg-video-intel/src/intel.h
DRI2_SWAP,
Index: xserver-xorg-video-intel/src/intel_display.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_display.c 2011-06-02 17:16:53.841343805 +1000
-+++ xserver-xorg-video-intel/src/intel_display.c 2011-06-02 17:16:59.491377184 +1000
+--- xserver-xorg-video-intel.orig/src/intel_display.c 2011-07-25 16:21:36.000000000 +1000
++++ xserver-xorg-video-intel/src/intel_display.c 2011-08-08 11:08:50.721290693 +1000
@@ -36,6 +36,8 @@
#include <errno.h>
#include <poll.h>
@@ -31,7 +31,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
#include "xorgVersion.h"
#include "intel.h"
-@@ -932,6 +934,13 @@
+@@ -937,6 +939,13 @@
drmModeConnectorPtr koutput = intel_output->mode_output;
struct intel_mode *mode = intel_output->mode;
int i;
@@ -45,7 +45,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyPtr props;
-@@ -1618,6 +1627,11 @@
+@@ -1630,6 +1639,11 @@
}
intel->modes = mode;
@@ -57,7 +57,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
return TRUE;
}
-@@ -1687,3 +1701,100 @@
+@@ -1699,3 +1713,100 @@
struct intel_crtc *intel_crtc = crtc->driver_private;
return intel_crtc->pipe;
}
@@ -160,9 +160,9 @@ Index: xserver-xorg-video-intel/src/intel_display.c
+
Index: xserver-xorg-video-intel/src/intel_driver.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-06-02 17:16:53.891344097 +1000
-+++ xserver-xorg-video-intel/src/intel_driver.c 2011-06-02 17:16:59.491377184 +1000
-@@ -935,6 +935,10 @@
+--- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-07-25 16:21:36.000000000 +1000
++++ xserver-xorg-video-intel/src/intel_driver.c 2011-08-08 11:08:50.721290693 +1000
+@@ -942,6 +942,10 @@
intel->directRenderingType = DRI_DRI2;
#endif
@@ -173,7 +173,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
if (!intel_init_initial_framebuffer(scrn))
return FALSE;
-@@ -943,6 +947,8 @@
+@@ -950,6 +954,8 @@
if (INTEL_INFO(intel)->gen >= 40)
gen4_render_state_init(scrn);
@@ -182,7 +182,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
miClearVisualTypes();
if (!miSetVisualTypes(scrn->depth,
miGetDefaultVisualMask(scrn->depth),
-@@ -1078,6 +1084,7 @@
+@@ -1085,6 +1091,7 @@
intel_mode_init(intel);
@@ -190,7 +190,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
intel->suspended = FALSE;
#if HAVE_UDEV
-@@ -1147,6 +1154,8 @@
+@@ -1154,6 +1161,8 @@
intel_set_gem_max_sizes(scrn);
@@ -199,49 +199,3 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
if (!xf86SetDesiredModes(scrn))
return FALSE;
-Index: xserver-xorg-video-intel/src/intel_batchbuffer.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/intel_batchbuffer.c 2011-06-02 17:16:53.861343922 +1000
-+++ xserver-xorg-video-intel/src/intel_batchbuffer.c 2011-06-02 17:30:50.535856598 +1000
-@@ -182,7 +182,7 @@
- return intel_get_pixmap_private(pixmap)->batch_write;
- }
-
--void intel_batch_submit(ScrnInfoPtr scrn)
-+void intel_batch_submit_internal(ScrnInfoPtr scrn, Bool force_flush)
- {
- intel_screen_private *intel = intel_get_screen_private(scrn);
- int ret;
-@@ -241,7 +241,7 @@
- }
- }
-
-- intel->needs_flush |= intel_batch_needs_flush(intel);
-+ intel->needs_flush |= force_flush ? TRUE : intel_batch_needs_flush(intel);
-
- while (!list_is_empty(&intel->batch_pixmaps)) {
- struct intel_pixmap *entry;
-@@ -282,6 +282,11 @@
- intel->current_batch = 0;
- }
-
-+void intel_batch_submit(ScrnInfoPtr scrn)
-+{
-+ intel_batch_submit_internal(scrn, FALSE);
-+}
-+
- void intel_debug_flush(ScrnInfoPtr scrn)
- {
- intel_screen_private *intel = intel_get_screen_private(scrn);
-Index: xserver-xorg-video-intel/src/intel_batchbuffer.h
-===================================================================
---- xserver-xorg-video-intel.orig/src/intel_batchbuffer.h 2011-06-02 17:16:53.821343687 +1000
-+++ xserver-xorg-video-intel/src/intel_batchbuffer.h 2011-06-02 17:16:59.491377184 +1000
-@@ -38,6 +38,7 @@
- void intel_batch_emit_flush(ScrnInfoPtr scrn);
- void intel_batch_do_flush(ScrnInfoPtr scrn);
- void intel_batch_submit(ScrnInfoPtr scrn);
-+void intel_batch_submit_internal(ScrnInfoPtr scrn, Bool force_flush);
-
- static inline int intel_batch_space(intel_screen_private *intel)
- {
Reply to: