.gitignore | 1
ChangeLog | 1145 ++
NEWS | 117
configure.ac | 85
debian/changelog | 41
debian/control | 10
debian/patches/100_b43_pciid_update.patch | 81
debian/patches/101_copy-fb.patch | 134
debian/patches/103-mbp-backlight-support.patch | 11
debian/patches/104_sandybridge_id_update.patch | 129
debian/patches/105_sandybridge_dri_disable.patch | 8
debian/patches/106_backport_vblank_on_server_regenerate_fix.patch | 112
debian/patches/series | 6
man/Makefile.am | 17
man/intel.man | 14
src/Makefile.am | 70
src/common.h | 237
src/drmmode_display.c | 1502 ---
src/i810.h | 341
src/i810_accel.c | 617 -
src/i810_common.h | 191
src/i810_cursor.c | 266
src/i810_dga.c | 282
src/i810_dri.c | 1544 ---
src/i810_dri.h | 131
src/i810_driver.c | 2410 -----
src/i810_hwmc.c | 419
src/i810_io.c | 133
src/i810_memory.c | 428
src/i810_reg.h | 3443
-------
src/i810_ring.h | 90
src/i810_video.c | 1423 ---
src/i810_wmark.c | 313
src/i830.h | 659 -
src/i830_3d.c | 2
src/i830_accel.c | 124
src/i830_batchbuffer.c | 268
src/i830_batchbuffer.h | 215
src/i830_dri.c | 1071 --
src/i830_driver.c | 1461 ---
src/i830_hwmc.c | 260
src/i830_hwmc.h | 75
src/i830_memory.c | 283
src/i830_reg.h | 67
src/i830_render.c | 60
src/i830_uxa.c | 1180 --
src/i830_video.c | 1743 ---
src/i830_video.h | 87
src/i915_3d.c | 6
src/i915_render.c | 80
src/i915_video.c | 19
src/i965_reg.h | 241
src/i965_render.c | 49
src/i965_video.c | 21
src/intel.h | 670 +
src/intel_batchbuffer.c | 280
src/intel_batchbuffer.h | 213
src/intel_display.c | 1617 +++
src/intel_dri.c | 1094 ++
src/intel_driver.c | 1294 ++
src/intel_driver.h | 278
src/intel_hwmc.c | 260
src/intel_hwmc.h | 75
src/intel_memory.c | 305
src/intel_module.c | 482 +
src/intel_uxa.c | 1426 +++
src/intel_video.c | 1782 +++
src/intel_video.h | 88
src/legacy/Makefile.am | 17
src/legacy/README | 6
src/legacy/i810/Makefile.am | 35
src/legacy/i810/i810.h | 335
src/legacy/i810/i810_accel.c | 617 +
src/legacy/i810/i810_common.h | 321
src/legacy/i810/i810_cursor.c | 266
src/legacy/i810/i810_dga.c | 258
src/legacy/i810/i810_dri.c | 1418 +++
src/legacy/i810/i810_dri.h | 131
src/legacy/i810/i810_driver.c | 2120 ++++
src/legacy/i810/i810_hwmc.c | 419
src/legacy/i810/i810_io.c | 133
src/legacy/i810/i810_memory.c | 428
src/legacy/i810/i810_reg.h | 3194
+++++++
src/legacy/i810/i810_ring.h | 90
src/legacy/i810/i810_video.c | 1423 +++
src/legacy/i810/i810_wmark.c | 313
src/legacy/i810/xvmc/I810XvMC.c | 4509
++++++++++
src/legacy/i810/xvmc/I810XvMC.h | 366
src/legacy/i810/xvmc/Makefile.am | 11
src/legacy/legacy.h | 3
src/xvmc/I810XvMC.c | 4509
----------
src/xvmc/I810XvMC.h | 366
src/xvmc/Makefile.am | 13
src/xvmc/i915_xvmc.c | 4
src/xvmc/i915_xvmc.h | 2
src/xvmc/i965_xvmc.c | 5
src/xvmc/intel_xvmc.h | 2
src/xvmc/xvmc_vld.c | 5
uxa/uxa-accel.c | 6
uxa/uxa-glyphs.c | 37
uxa/uxa-priv.h | 1
uxa/uxa-render.c | 12
uxa/uxa.c | 15
103 files changed, 28218 insertions(+), 26758 deletions(-)
New commits:
commit a293a50bed27b1d61ad64cd36cb60bc31c85b659
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Nov 1 12:36:19 2010 -0400
Refresh 105_sandybridge_dri_disable.patch.
diff --git a/debian/changelog b/debian/changelog
index 2194d27..9b50e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xserver-xorg-video-intel (2:2.13.0-1ubuntu1) natty;
urgency=low
the ability to disable KMS.
* Dropped patches:
100_b43_pciid_update.patch: Upstream
+ 102-disable-page-flipping-v2.patch: Should be unneeded.
103-mbp-backlight-support.patch: Upstream
104_sandybridge_id_update.patch: Upstream
106_backport_vblank_on_server_regenerate_fix.patch: Upstream
diff --git a/debian/patches/105_sandybridge_dri_disable.patch
b/debian/patches/105_sandybridge_dri_disable.patch
index e27e8d2..5dff4c4 100644
--- a/debian/patches/105_sandybridge_dri_disable.patch
+++ b/debian/patches/105_sandybridge_dri_disable.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Disable non-functional DRI completely on
Sandybridge.
Revert after Intel 2010Q4 release that will support it.
---
- src/i830_driver.c | 2 ++
+ src/intel_driver.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
-diff --git a/src/i830_driver.c b/src/i830_driver.c
+diff --git a/src/intel_driver.c b/src/intel_driver.c
index b8e0c0b..c9072d4 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
@@ -1037,6 +1037,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int
argc, char **argv)
scrn->videoRam = device->regions[fb_bar].size / 1024;
diff --git a/debian/patches/series b/debian/patches/series
index 12be815..d3c6ea5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
101_copy-fb.patch
-102-disable-page-flipping-v2.patch
-103-mbp-backlight-support.patch
-104_sandybridge_id_update.patch
105_sandybridge_dri_disable.patch
commit dce8273837e9c7e3feb44466b17bd9ee2dfc0500
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Nov 1 12:07:52 2010 -0400
Refresh 101_copy-fb.patch
diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index dbd105a..69dfad9 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -1,7 +1,27 @@
-Index: xserver-xorg-video-intel/src/drmmode_display.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/drmmode_display.c 2010-09-23
16:26:34.275006000 +1000
-+++ xserver-xorg-video-intel/src/drmmode_display.c 2010-09-23
16:29:20.555006001 +1000
+diff --git a/src/intel.h b/src/intel.h
+index 9e8323c..dc5d570 100644
+--- a/src/intel.h
++++ b/src/intel.h
+@@ -420,6 +420,7 @@ typedef struct intel_screen_private {
+ OptionInfoPtr Options;
+
+ /* Driver phase/state information */
++ Bool starting;
+ Bool suspended;
+
+ enum last_3d last_3d;
+@@ -445,6 +446,7 @@ extern void intel_mode_fini(intel_screen_private *intel);
+ 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);
++extern void intel_copy_fb(ScrnInfoPtr scrn);
+
+ extern Bool intel_do_pageflip(ScreenPtr screen, dri_bo *new_front, void
*data);
+
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 97c1a0a..13924c0 100644
+--- a/src/intel_display.c
++++ b/src/intel_display.c
@@ -36,6 +36,8 @@
#include <errno.h>
#include <poll.h>
@@ -10,42 +30,42 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+
#include "xorgVersion.h"
- #include "i830.h"
-@@ -853,6 +855,13 @@
- drmmode_ptr drmmode = drmmode_output->drmmode;
+ #include "intel.h"
+@@ -888,6 +890,13 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
+ drmModeConnectorPtr koutput = intel_output->mode_output;
+ struct intel_mode *mode = intel_output->mode;
int i;
- drmModePropertyPtr props;
+ intel_screen_private *intel = intel_get_screen_private(output->scrn);
+
+ /* xf86Crtc.c calls dpms off in set desired modes, so ignore
+ * the request if we're starting up. */
-+
++
+ if (intel->starting)
+ return;
for (i = 0; i < koutput->count_props; i++) {
- props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1466,6 +1475,8 @@
- drm_wakeup_handler, drmmode);
+ drmModePropertyPtr props;
+@@ -1523,6 +1532,8 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int
cpp)
}
+ intel->modes = mode;
+ scrn->canDoBGNoneRoot = TRUE;
+
return TRUE;
}
-@@ -1500,3 +1511,101 @@
- drmModeRmFB(drmmode->fd, drmmode->fb_id);
- drmmode->fb_id = 0;
+@@ -1593,3 +1604,102 @@ intel_crtc_id(xf86CrtcPtr crtc)
+ {
+ return crtc_id(crtc->driver_private);
}
+
+static PixmapPtr
-+drmmode_create_pixmap_for_fbcon(ScrnInfoPtr scrn)
++intel_create_pixmap_for_fbcon(ScrnInfoPtr scrn)
+{
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-+ drmmode_crtc_private_ptr drmmode_crtc =
xf86_config->crtc[0]->driver_private;
++ struct intel_crtc *intel_crtc = xf86_config->crtc[0]->driver_private;
+ ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
-+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
++ struct intel_mode *mode = intel_crtc->mode;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ drmModeFBPtr fbcon = NULL;
+ struct drm_gem_flink flink;
@@ -53,20 +73,20 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+ PixmapPtr pixmap = NULL;
+ int i;
+
-+ for (i = 0; i < drmmode->mode_res->count_crtcs; i++) {
-+ drmmode_crtc = xf86_config->crtc[i]->driver_private;
-+ if (drmmode_crtc->mode_crtc->buffer_id == 0)
++ for (i = 0; i < mode->mode_res->count_crtcs; i++) {
++ intel_crtc = xf86_config->crtc[i]->driver_private;
++ if (intel_crtc->mode_crtc->buffer_id == 0)
+ continue;
-+ fbcon = drmModeGetFB(drmmode->fd,
-+ drmmode_crtc->mode_crtc->buffer_id);
++ fbcon = drmModeGetFB(mode->fd,
++ intel_crtc->mode_crtc->buffer_id);
+ if (fbcon != NULL)
+ break;
+ }
-+ if (i == drmmode->mode_res->count_crtcs)
++ if (i == mode->mode_res->count_crtcs)
+ return NULL;
+
+ flink.handle = fbcon->handle;
-+ if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
++ if (ioctl(mode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "Couldn't flink fbcon handle\n");
+ return NULL;
@@ -79,10 +99,8 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+ "Couldn't allocate bo for fbcon handle\n");
+ return NULL;
+ }
-+
-+
-+ if (!CreateScratchPixmapsForScreen(scrn->scrnIndex))
-+ return FALSE;
++ if (!CreateScratchPixmapsForScreen(pScreen->myNum))
++ return NULL;
+
+ pixmap = GetScratchPixmapHeader(pScreen,
+ fbcon->width, fbcon->height,
@@ -94,21 +112,21 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+ return NULL;
+ }
+
-+ i830_set_pixmap_bo(pixmap, bo);
++ intel_set_pixmap_bo(pixmap, bo);
+ drm_intel_bo_unreference(bo);
+ drmModeFreeFB(fbcon);
+
+ return pixmap;
+}
+
-+void drmmode_copy_fb(ScrnInfoPtr scrn)
++void intel_copy_fb(ScrnInfoPtr scrn)
+{
+ ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ PixmapPtr src, dst;
+ unsigned int pitch = scrn->displayWidth * intel->cpp;
+
-+ src = drmmode_create_pixmap_for_fbcon(scrn);
++ src = intel_create_pixmap_for_fbcon(scrn);
+ if (src == NULL) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+ "Couldn't create pixmap for fbcon\n");
@@ -121,7 +139,7 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+ scrn->depth, scrn->bitsPerPixel,
+ pitch,
+ NULL);
-+ i830_set_pixmap_bo(dst, intel->front_buffer);
++ intel_set_pixmap_bo(dst, intel->front_buffer);
+
+ intel->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES);
+
@@ -130,59 +148,41 @@ Index: xserver-xorg-video-intel/src/drmmode_display.c
+
+ intel->uxa_driver->done_copy(dst);
+
-+ intel_batch_submit (scrn, TRUE);
++ intel_batch_emit_flush(scrn);
++ intel_batch_submit(scrn, TRUE);
++ intel_batch_wait_last(scrn);
+
+ (*pScreen->DestroyPixmap)(src);
+ (*pScreen->DestroyPixmap)(dst);
+ FreeScratchPixmapsForScreen(pScreen->myNum);
+}
-Index: xserver-xorg-video-intel/src/i830.h
-===================================================================
---- xserver-xorg-video-intel.orig/src/i830.h 2010-09-23 16:26:34.385006000
+1000
-+++ xserver-xorg-video-intel/src/i830.h 2010-09-23 16:29:20.555006001
+1000
-@@ -423,6 +423,7 @@
- OptionInfoPtr Options;
-
- /* Driver phase/state information */
-+ Bool starting;
- Bool suspended;
-
- enum last_3d last_3d;
-@@ -486,6 +487,7 @@
- xf86CrtcPtr crtc);
- extern int drmmode_output_dpms_status(xf86OutputPtr output);
- extern int drmmode_crtc_id(xf86CrtcPtr crtc);
-+extern void drmmode_copy_fb(ScrnInfoPtr scrn);
-
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
- extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
-Index: xserver-xorg-video-intel/src/i830_driver.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/i830_driver.c 2010-09-23
16:26:34.165006000 +1000
-+++ xserver-xorg-video-intel/src/i830_driver.c 2010-09-23 16:29:20.565006001
+1000
-@@ -1093,6 +1093,8 @@
++
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 9b2fdaf..b4d42a2 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -879,6 +879,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc,
char **argv)
if (IS_I965G(intel))
gen4_render_state_init(scrn);
-+ intel->starting = TRUE;
++ intel->starting = FALSE;
+
miClearVisualTypes();
if (!miSetVisualTypes(scrn->depth,
miGetDefaultVisualMask(scrn->depth),
-@@ -1231,6 +1233,7 @@
- if (serverGeneration == 1)
- xf86ShowUnusedOptions(scrn->scrnIndex, scrn->options);
+@@ -1014,6 +1016,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int
argc, char **argv)
+
+ intel_mode_init(intel);
+ intel->starting = FALSE;
intel->suspended = FALSE;
return uxa_resources_init(screen);
-@@ -1289,6 +1292,9 @@
+@@ -1079,6 +1082,8 @@ static Bool I830EnterVT(int scrnIndex, int flags)
- i830_set_gem_max_sizes(scrn);
+ intel_set_gem_max_sizes(scrn);
-+ if (!IS_GEN6(intel))
-+ drmmode_copy_fb(scrn);
++ intel_copy_fb(scrn);
+
if (!xf86SetDesiredModes(scrn))
return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index e9139dc..12be815 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-100_b43_pciid_update.patch
101_copy-fb.patch
102-disable-page-flipping-v2.patch
103-mbp-backlight-support.patch
commit dee19c68663b75aea3ef7e65f6062fb102c2843c
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Nov 1 12:05:34 2010 -0400
Drop some upstream patches, add new changelog entry.
diff --git a/debian/changelog b/debian/changelog
index 5905efa..2194d27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+xserver-xorg-video-intel (2:2.13.0-1ubuntu1) natty; urgency=low
+
+ * New upstream release. Remaining Ubuntu changes:
+ - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev,
+ debian/xserver-xorg-video-intel:
+ Add apport script to collect debug information on GPU hangs
+ - rules: Install udev rule to run the script when the kernel detects hung
GPU
+ - 101_copy-fb.patch: Adds feature to driver so Xserver can draw
+ root windows with no background. This enables smooth boot with
+ Plymouth.
+ - control: Add Recommends on intel-gpu-tools to xserver-xorg-video-intel
+ package for use by GPU hang scripts.
+ - xserver-xorg-video-intel.preinst.in,
xserver-xorg-video-intel.postinst.in,
+ rules:
+ Don't install /etc/modprobe.d/i915-kms.conf, and remove it on upgrades.
+ At best it's redundant (as the kernel defaults to KMS), at worst it
breaks
+ the ability to disable KMS.
+ * Dropped patches:
+ 100_b43_pciid_update.patch: Upstream
+ 103-mbp-backlight-support.patch: Upstream
+ 104_sandybridge_id_update.patch: Upstream
+ 106_backport_vblank_on_server_regenerate_fix.patch: Upstream
+
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 01 Nov 2010 11:43:22 -0400
+
xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low
[ Sven Joachim ]
diff --git a/debian/patches/100_b43_pciid_update.patch
b/debian/patches/100_b43_pciid_update.patch
deleted file mode 100644
index 7c3d2ce..0000000
--- a/debian/patches/100_b43_pciid_update.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/src/common.h b/src/common.h
-index 30f1c78..d7e7e4b 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -313,6 +313,11 @@ extern int I810_DEBUG;
- #define PCI_CHIP_B43_G_BRIDGE 0x2E40
- #endif
-
-+#ifndef PCI_CHIP_B43_G1
-+#define PCI_CHIP_B43_G1 0x2E92
-+#define PCI_CHIP_B43_G1_BRIDGE 0x2E90
-+#endif
-+
- #ifndef PCI_CHIP_IGDNG_D_G
- #define PCI_CHIP_IGDNG_D_G 0x0042
- #define PCI_CHIP_IGDNG_D_G_BRIDGE 0x0040
-@@ -356,7 +361,7 @@ extern int I810_DEBUG;
- #define IS_IGDG(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_G)
- #define IS_IGD(pI810) (IS_IGDG(pI810) || IS_IGDGM(pI810))
- #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
--#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G ||
DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) ==
PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G ||
DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G || IS_GM45(pI810))
-+#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G ||
DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) ==
PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G ||
DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G || DEVICE_ID(pI810->PciInfo) ==
PCI_CHIP_B43_G1 || IS_GM45(pI810))
- #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM ||
DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
- #define IS_965_Q(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q)
- #define IS_IGDNG_D(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_D_G)
-diff --git a/src/i810_driver.c b/src/i810_driver.c
-index 088b552..f5cf9a9 100644
---- a/src/i810_driver.c
-+++ b/src/i810_driver.c
-@@ -138,6 +138,7 @@ static const struct pci_id_match intel_device_match[] = {
- INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_B43_G1, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE, 0 ),
-@@ -194,6 +195,7 @@ static SymTabRec I810Chipsets[] = {
- {PCI_CHIP_Q45_G, "Q45/Q43"},
- {PCI_CHIP_G41_G, "G41"},
- {PCI_CHIP_B43_G, "B43"},
-+ {PCI_CHIP_B43_G1, "B43"},
- {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
- {PCI_CHIP_IGDNG_M_G, "Arrandale"},
- {-1, NULL}
-@@ -233,6 +235,7 @@ static PciChipsets I810PciChipsets[] = {
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL},
- {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL},
- {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL},
-+ {PCI_CHIP_B43_G1, PCI_CHIP_B43_G1, NULL},
- {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
- {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
- {-1, -1, NULL }
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index b8e0c0b..4249c80 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -114,6 +114,7 @@ static SymTabRec I830Chipsets[] = {
- {PCI_CHIP_Q45_G, "Q45/Q43"},
- {PCI_CHIP_G41_G, "G41"},
- {PCI_CHIP_B43_G, "B43"},
-+ {PCI_CHIP_B43_G1, "B43"},
- {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
- {PCI_CHIP_IGDNG_M_G, "Arrandale"},
- {-1, NULL}
-@@ -147,6 +148,7 @@ static PciChipsets I830PciChipsets[] = {
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL},
- {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL},
- {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL},
-+ {PCI_CHIP_B43_G1, PCI_CHIP_B43_G1, NULL},
- {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
- {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
- {-1, -1, NULL}
-@@ -491,6 +493,7 @@ static void i830_detect_chipset(ScrnInfoPtr scrn)
- chipname = "G41";
- break;
- case PCI_CHIP_B43_G:
-+ case PCI_CHIP_B43_G1:
- chipname = "B43";
- break;
- case PCI_CHIP_IGDNG_D_G:
diff --git a/debian/patches/103-mbp-backlight-support.patch
b/debian/patches/103-mbp-backlight-support.patch
deleted file mode 100644
index 2ffe711..0000000
--- a/debian/patches/103-mbp-backlight-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u xserver-xorg-video-intel-2.9.1/src/drmmode_display.c
xserver-xorg-video-intel-2.9.1/src/drmmode_display.c
---- xserver-xorg-video-intel-2.9.1/src/drmmode_display.c
-+++ xserver-xorg-video-intel-2.9.1/src/drmmode_display.c
-@@ -95,6 +95,7 @@
- "asus-laptop",
- "eeepc",
- "thinkpad_screen",
-+ "mbp_backlight",
- "acpi_video1",
- "acpi_video0",
- "fujitsu-laptop",
diff --git a/debian/patches/104_sandybridge_id_update.patch
b/debian/patches/104_sandybridge_id_update.patch
deleted file mode 100644
index e34dd7e..0000000
--- a/debian/patches/104_sandybridge_id_update.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 07b87ed8ef6c2ed144c5b646cf3116aa642fb89a Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarv...@ubuntu.com>
-Date: Fri, 10 Sep 2010 07:36:12 -0400
-Subject: [PATCH] Update Sandybridge device id's.
-
-Backport of upstream commits 53767cc0d0a58d36cd445da3a31c65b349eebbba
-and 104cd0554bde1d109a54db7a93700d5edfabd914. Drop after 2.12.
-
-Signed-off-by: Robert Hooker <sarv...@ubuntu.com>
----
- src/common.h | 25 ++++++++++++++++++-------
- src/i810_driver.c | 23 +++++++++++++++++++++--
- src/i830_driver.c | 9 +++++++++
- 3 files changed, 48 insertions(+), 9 deletions(-)
-
-diff --git a/src/common.h b/src/common.h
-index 30f1c78..6824b15 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -323,11 +323,17 @@ extern int I810_DEBUG;
- #define PCI_CHIP_IGDNG_M_G_BRIDGE 0x0044
- #endif
-
--#ifndef PCI_CHIP_SANDYBRIDGE
--#define PCI_CHIP_SANDYBRIDGE 0x0102
--#define PCI_CHIP_SANDYBRIDGE_BRIDGE 0x0100
--#define PCI_CHIP_SANDYBRIDGE_M 0x0106
--#define PCI_CHIP_SANDYBRIDGE_BRIDGE_M 0x0104
-+#ifndef PCI_CHIP_SANDYBRIDGE_BRIDGE
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE 0x0100 /* Desktop */
-+#define PCI_CHIP_SANDYBRIDGE_GT1 0x0102
-+#define PCI_CHIP_SANDYBRIDGE_GT2 0x0112
-+#define PCI_CHIP_SANDYBRIDGE_GT2_PLUS 0x0122
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE_M 0x0104 /* Mobile */
-+#define PCI_CHIP_SANDYBRIDGE_M_GT1 0x0106
-+#define PCI_CHIP_SANDYBRIDGE_M_GT2 0x0116
-+#define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS 0x0126
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE_S 0x0108 /* Server */
-+#define PCI_CHIP_SANDYBRIDGE_S_GT 0x010A
- #endif
-
- #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
-@@ -385,8 +391,13 @@ extern int I810_DEBUG;
-
- #define IS_I915(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) ||
IS_I945G(pI810) || IS_I945GM(pI810) || IS_G33CLASS(pI810))
-
--#define IS_GEN6(pI810) ((pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE
|| \
-- (pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_M)
-+#define IS_GEN6(pI810) ((pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_GT1 || \
-+ (pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_GT2
|| \
-+ (pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_GT2_PLUS || \
-+ (pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_M_GT1 ||\
-+ (pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_M_GT2 || \
-+ (pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS ||\
-+ (pI810)->PciInfo->device_id ==
PCI_CHIP_SANDYBRIDGE_S_GT)
-
- #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) ||
IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_GM45(pI810) ||
IS_IGD(pI810) || IS_IGDNG_M(pI810))
- /* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
-diff --git a/src/i810_driver.c b/src/i810_driver.c
-index 088b552..4440fd9 100644
---- a/src/i810_driver.c
-+++ b/src/i810_driver.c
-@@ -140,8 +140,13 @@ static const struct pci_id_match intel_device_match[] = {
- INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
-- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE, 0 ),
-- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT1, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2_PLUS, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT1, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_S_GT, 0 ),
- { 0, 0, 0 },
- };
-
-@@ -196,6 +201,13 @@ static SymTabRec I810Chipsets[] = {
- {PCI_CHIP_B43_G, "B43"},
- {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
- {PCI_CHIP_IGDNG_M_G, "Arrandale"},
-+ {PCI_CHIP_SANDYBRIDGE_GT1, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_GT2, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_GT2_PLUS, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_M_GT1, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_M_GT2, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, "Sandybridge" },
-+ {PCI_CHIP_SANDYBRIDGE_S_GT, "Sandybridge" },
- {-1, NULL}
- };
-
-@@ -235,6 +247,13 @@ static PciChipsets I810PciChipsets[] = {
- {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL},
- {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
- {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_GT1, PCI_CHIP_SANDYBRIDGE_GT1, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_GT2, PCI_CHIP_SANDYBRIDGE_GT2, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_GT2_PLUS, PCI_CHIP_SANDYBRIDGE_GT2_PLUS, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_M_GT1, PCI_CHIP_SANDYBRIDGE_M_GT1, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_M_GT2, PCI_CHIP_SANDYBRIDGE_M_GT2, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, NULL},
-+ {PCI_CHIP_SANDYBRIDGE_S_GT, PCI_CHIP_SANDYBRIDGE_S_GT,
NULL},
- {-1, -1, NULL }
- };
-
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index b8e0c0b..b13894e 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -499,6 +499,15 @@ static void i830_detect_chipset(ScrnInfoPtr scrn)
- case PCI_CHIP_IGDNG_M_G:
- chipname = "Arrandale";
- break;
-+ case PCI_CHIP_SANDYBRIDGE_GT1:
-+ case PCI_CHIP_SANDYBRIDGE_GT2:
-+ case PCI_CHIP_SANDYBRIDGE_GT2_PLUS:
-+ case PCI_CHIP_SANDYBRIDGE_M_GT1:
-+ case PCI_CHIP_SANDYBRIDGE_M_GT2:
-+ case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS:
-+ case PCI_CHIP_SANDYBRIDGE_S_GT:
-+ chipname = "Sandybridge";
-+ break;
- default:
- chipname = "unknown chipset";
- break;
---
-1.7.2
-
diff --git a/debian/patches/106_backport_vblank_on_server_regenerate_fix.patch
b/debian/patches/106_backport_vblank_on_server_regenerate_fix.patch
deleted file mode 100644
index ecf6557..0000000
--- a/debian/patches/106_backport_vblank_on_server_regenerate_fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Author: Christopher Halse Rogers <christopher.halse.rog...@canonical.com>
-Description: Backport vsync fix from the following commit:
- .
- commit c882f6a22a862c1664c375e05e5e6fc4bdb04edb
- Author: Chris Wilson <ch...@chris-wilson.co.uk>
- Date: Wed Aug 18 10:21:22 2010 +0100
-
- Move registration of vsync fd from pre-init to screen-init
-
- Marty Jack reported an issue he found where the page-flipping handler
- was being lost on server reset. This results in the swap completion
- notification being lost, with the sporadic hang of full screen
- applications like Compiz, flash and even glxgears!
-
- Fixes:
-
- Bug 29584 - Server in compute loop
- https://bugs.freedesktop.org/show_bug.cgi?id=29584
-
- There are also several possibly related bugs with similar symptoms, i.e.
- OpenGL applications hanging on missed swap notifications.
-
- Reported-by: Marty Jack <marty...@comcast.net>
- Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
- Cc: Keith Packard <kei...@keithp.com>
-
-Index: xserver-xorg-video-intel/src/drmmode_display.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/drmmode_display.c 2010-09-26
10:33:35.167165002 +1000
-+++ xserver-xorg-video-intel/src/drmmode_display.c 2010-09-26
10:37:41.000000000 +1000
-@@ -1466,14 +1466,12 @@
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Kernel page flipping support detected, but forcibly
disabled.\n");
- intel->use_pageflipping = FALSE;
-- drmmode->flip_count = 0;
-+ intel->can_pageflip = TRUE;
-+
- drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
- drmmode->event_context.vblank_handler = drmmode_vblank_handler;
- drmmode->event_context.page_flip_handler =
- drmmode_page_flip_handler;
-- AddGeneralSocket(fd);
-- RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
-- drm_wakeup_handler, drmmode);
- }
-
- scrn->canDoBGNoneRoot = TRUE;
-@@ -1481,6 +1479,31 @@
- return TRUE;
- }
-
-+void
-+drmmode_init(ScrnInfoPtr scrn)
-+{
-+ intel_screen_private *intel = intel_get_screen_private(scrn);
-+ if (intel->can_pageflip) {
-+ xf86CrtcConfigPtr xf86_config;
-+ drmmode_crtc_private_ptr drmmode_crtc;
-+ drmmode_ptr drmmode;
-+
-+ xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-+
-+ drmmode_crtc = xf86_config->crtc[0]->driver_private;
-+ drmmode = drmmode_crtc->drmmode;
-+
-+ /* We need to re-register the mode->fd for the synchronisation
-+ * feedback on every server generation, so perform the
-+ * registration within ScreenInit and not PreInit.
-+ */
-+ drmmode->flip_count = 0;
-+ AddGeneralSocket(drmmode->fd);
-+ RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
-+ drm_wakeup_handler, drmmode);
-+ }
-+}
-+
- int
- drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
- {
-Index: xserver-xorg-video-intel/src/i830.h
-===================================================================
---- xserver-xorg-video-intel.orig/src/i830.h 2010-09-26 10:33:35.127165002
+1000
-+++ xserver-xorg-video-intel/src/i830.h 2010-09-26 10:38:21.000000000
+1000
-@@ -417,6 +417,7 @@
- char *deviceName;
-
- Bool use_pageflipping;
-+ Bool can_pageflip;
- Bool force_fallback;
-
- /* Broken-out options. */
-@@ -442,6 +443,7 @@
- };
-
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
-+extern void drmmode_init(ScrnInfoPtr scrn);
- extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr,
xf86CrtcPtr crtc);
- extern int drmmode_output_dpms_status(xf86OutputPtr output);
- extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, void
*data);
-Index: xserver-xorg-video-intel/src/i830_driver.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/i830_driver.c 2010-09-26
10:33:35.197165002 +1000
-+++ xserver-xorg-video-intel/src/i830_driver.c 2010-09-26 10:33:35.217165002
+1000
-@@ -1244,6 +1244,8 @@
- if (serverGeneration == 1)
- xf86ShowUnusedOptions(scrn->scrnIndex, scrn->options);
-
-+ drmmode_init(scrn);
-+
- intel->starting = FALSE;
- intel->suspended = FALSE;
-
diff --git a/debian/patches/series b/debian/patches/series
index 7305a75..e9139dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@
103-mbp-backlight-support.patch
104_sandybridge_id_update.patch
105_sandybridge_dri_disable.patch
-106_backport_vblank_on_server_regenerate_fix.patch
-108_sandybridge_disable_Xv.patch
commit 9f5151da81dbb58ec49ea118a7461f9a98cf55e2
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 2 09:16:36 2010 +0200
Upload to experimental (fixing the upstream version number).
diff --git a/debian/changelog b/debian/changelog
index f1f606b..3a6f6ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.13-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.0-1) experimental; urgency=low
[ Sven Joachim ]
* New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.13-1) UNRELEASED; urgency=low
architectures: UMS is gone, this means Linux-only.
* Add myself to Uploaders.
- -- Cyril Brulebois <k...@debian.org> Fri, 01 Oct 2010 22:48:23 +0200
+ -- Cyril Brulebois <k...@debian.org> Sat, 02 Oct 2010 09:51:48 +0200
xserver-xorg-video-intel (2:2.12.0-1) experimental; urgency=low
commit 8ed721471777cab789588b89d920237549fc3207
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 2 03:10:37 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8fa2251..f1f606b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-intel (2:2.13-1) UNRELEASED; urgency=low
1.8).
* Picked from unstable to avoid introducing back binaries on non-Linux
architectures: UMS is gone, this means Linux-only.
+ * Add myself to Uploaders.
-- Cyril Brulebois <k...@debian.org> Fri, 01 Oct 2010 22:48:23 +0200
diff --git a/debian/control b/debian/control
index 8054331..0fbac14 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-intel
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
commit 5e67cd7e454996f80283c44991543ca660f21114
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Oct 2 03:06:17 2010 +0200
UMS is gone, this means Linux-only.
(cherry picked from commit 2586daf3f7e86c1857ab426f98e0ae4045c9e239)
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 6b0e0a3..8fa2251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-video-intel (2:2.13-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Bump xutils-dev build-dependency to 1:7.5+4 (needed for xorg macros
1.8).
+ * Picked from unstable to avoid introducing back binaries on non-Linux
+ architectures: UMS is gone, this means Linux-only.
-- Cyril Brulebois <k...@debian.org> Fri, 01 Oct 2010 22:48:23 +0200
diff --git a/debian/control b/debian/control
index 01fdf32..8054331 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Vcs-Git:
git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
Package: xserver-xorg-video-intel
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
+Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1),
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting,
xserver-xorg-driver-i810
@@ -58,7 +58,7 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
This package is built from the X.org xf86-video-intel driver module.
Package: xserver-xorg-video-intel-dbg
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386
+Architecture: amd64 i386
Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends}
Recommends: intel-gpu-tools
Section: debug
commit 326a36c67bea6a22e995f37805f264143b05cae9
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Oct 1 22:49:34 2010 +0200
Bump xutils-dev build-dependency to 1:7.5+4 (needed for xorg macros 1.8).
diff --git a/debian/changelog b/debian/changelog
index a05f0a1..6b0e0a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-intel (2:2.13-1) UNRELEASED; urgency=low
+ [ Sven Joachim ]
* New upstream release.
* Bump libdrm build-dependency to 2.4.22.
- -- Sven Joachim <svenj...@gmx.de> Wed, 29 Sep 2010 09:58:16 +0200
+ [ Cyril Brulebois ]
+ * Bump xutils-dev build-dependency to 1:7.5+4 (needed for xorg macros
+ 1.8).
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 01 Oct 2010 22:48:23 +0200
xserver-xorg-video-intel (2:2.12.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d9eebd8..01fdf32 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git
commit 8c2abe3760fa179923783c46ba824f06a856313b
Author: Sven Joachim <svenj...@gmx.de>
Date: Thu Sep 30 19:39:35 2010 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 58bc18f..954e305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit 9f232ad67c72b7869dcd112207bc41dc01d7d104
+Author: Carl Worth <cwo...@cworth.org>
+Date: Thu Sep 30 08:45:49 2010 -0700
+
+ Increment version to 2.13.0
+
+ For the new, major release.
+
+commit 99ec9bb0f1eaf2e5c04614957a51624a928526e5
+Author: Carl Worth <cwo...@cworth.org>
+Date: Thu Sep 30 08:45:15 2010 -0700
+
+ Add release notes for the 2.13.0 release.
+
+ Which is functionalliy identical to 2.12.902.
+
commit d4c013cb9d92d2959c9a98eca20e43ab14ae22e3
Author: Carl Worth <cwo...@cworth.org>
Date: Tue Sep 28 20:49:52 2010 -0700
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pcxrq-000240...@alioth.debian.org
