xserver-xorg-video-nouveau: Changes to 'ubuntu'

2014-09-10 Thread Maarten Bernardus Lankhorst 
 debian/changelog  |   10 +--
 debian/patches/xmir.patch |   62 +++---
 2 files changed, 39 insertions(+), 33 deletions(-)

New commits:
commit d8ef0ebf21518961f002e8d8dca75a822927cf36
Author: Maarten Lankhorst 
Date:   Wed Sep 10 17:01:14 2014 +0200

Refresh xmir patch to apply after dropping vblank patch.

diff --git a/debian/changelog b/debian/changelog
index 9b9bd4d..ba55fec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.11-1ubuntu2) utopic; urgency=low
+
+  * Refresh xmir patch to apply after dropping vblank patch.
+
+ -- Maarten Lankhorst   Wed, 10 Sep 2014 
17:00:42 +0200
+
 xserver-xorg-video-nouveau (1:1.0.11-1ubuntu1) utopic; urgency=medium
 
   * Merge from debian-unstable: Remaining Ubuntu diff:
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index fe22b35..b0dbc33 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -26,7 +26,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
nv_window_belongs_to_crtc(scrn, draw->x, draw->y,
  draw->width, draw->height);
  }
-@@ -951,6 +951,19 @@
+@@ -954,6 +954,19 @@
return TRUE;
  }
  
@@ -46,7 +46,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  Bool
  nouveau_dri2_init(ScreenPtr pScreen)
  {
-@@ -992,6 +1005,11 @@
+@@ -995,6 +1008,11 @@
dri2.GetParam = NULL;
  #endif
  
@@ -60,7 +60,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -231,6 +231,8 @@
+@@ -236,6 +236,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
(*flag) = 0;
@@ -69,7 +69,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
return TRUE;
  #if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,15,99,0,0)
case SUPPORTS_SERVER_FDS:
-@@ -309,6 +311,8 @@
+@@ -323,6 +325,8 @@
  #endif
if (fd != -1)
ret = nouveau_device_wrap(fd, 0, &dev);
@@ -78,7 +78,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
else
ret = nouveau_device_open(busid, &dev);
if (ret)
-@@ -372,6 +376,23 @@
+@@ -386,6 +390,23 @@
  }
  
  static Bool
@@ -102,7 +102,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
   intptr_t match_data)
  {
-@@ -382,6 +403,10 @@
+@@ -396,6 +417,10 @@
};
ScrnInfoPtr pScrn = NULL;
  
@@ -113,7 +113,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
if (!NVHasKMS(pci_dev, NULL))
return FALSE;
  
-@@ -406,6 +431,9 @@
+@@ -420,6 +445,9 @@
if (!dev->pdev)
return FALSE;
  
@@ -123,7 +123,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
if (!NVHasKMS(dev->pdev, dev))
return FALSE;
  
-@@ -445,7 +473,8 @@
+@@ -459,7 +487,8 @@
  NVAdjustFrame(ADJUST_FRAME_ARGS_DECL)
  {
SCRN_INFO_PTR(arg);
@@ -133,7 +133,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  }
  
  /*
-@@ -462,7 +491,7 @@
+@@ -476,7 +505,7 @@
  #ifdef XF86_PDEV_SERVER_FD
NVEntPtr pNVEnt = NVEntPriv(pScrn);
  #endif
@@ -142,7 +142,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
  
-@@ -471,7 +500,8 @@
+@@ -485,7 +514,8 @@
  (pNVEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)))
  #endif
{
@@ -152,7 +152,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
if (ret)
ErrorF("Unable to get master: %s\n", strerror(errno));
}
-@@ -509,6 +539,9 @@
+@@ -523,6 +553,9 @@
return;
  #endif
  
@@ -162,7 +162,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
ret = drmDropMaster(pNv->dev->fd);
if (ret && errno != EIO && errno != ENODEV)
ErrorF("Error dropping master: %i(%m)\n", -errno);
-@@ -557,6 +590,50 @@
+@@ -571,6 +604,50 @@
  }
  #endif
  
@@ -213,7 +213,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  static void 
  NVBlockHandler (BLOCKHANDLER_ARGS_DECL)
  {
-@@ -572,12 +649,29 @@
+@@ -586,12 +663,29 @@
nouveau_dirty_update(pScreen);
  #endif
  
@@ -243,7 +243,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  static Bool
  NVCreateScreenResources(ScreenPtr pScreen)
  {
-@@ -589,7 +683,10 @@
+@@ -603,7 +697,10 @@
return FALSE;
pScreen->CreateScreenResources = NVCreateScreenResources;
  
@@ -255,7 +255,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
if (!NVEnterVT(VT_FUNC_ARGS(0)))
return FALSE;
  
-@@ -618,7 +715,7 @@
+@@ -632,7 +729,7 @@
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
NVPtr pNv = NVPTR(pScrn);
  
@@ -264,7 +264,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
drmmode_screen_fini(pScreen);
  
nouveau_present_fini(pScreen);
-@@ -766,6 +863,9 @@
+@@ -780,6 +877,9 @@
if (!pNv->dev)
return FALSE;
  
@@ -

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2014-09-10 Thread Maarten Bernardus Lankhorst 
 .gitignore|1 
 configure.ac  |   25 ++---
 debian/changelog  |   17 ++
 debian/control|6 +-
 debian/copyright  |3 -
 debian/patches/100-vblank-on.diff |   13 
 debian/patches/series |1 
 debian/source/local-options   |1 
 man/nouveau.man   |2 
 src/drmmode_display.c |   99 --
 src/nouveau_dri2.c|   47 +-
 src/nouveau_present.c |   50 +--
 src/nouveau_xv.c  |   94 
 src/nv10_exa.c|   14 ++---
 src/nv50_accel.c  |   15 +++--
 src/nv_accel_common.c |   17 +++---
 src/nv_driver.c   |   20 ++-
 src/nv_proto.h|3 +
 src/nv_type.h |4 +
 src/nvc0_accel.c  |   15 +++--
 20 files changed, 309 insertions(+), 138 deletions(-)

New commits:
commit c7b3fecbae5d771dbbd2a2045bb6b43a981b272c
Author: Maarten Lankhorst 
Date:   Wed Sep 10 14:47:08 2014 +0200

Drop enabling vblank patch, enabled by default now.

diff --git a/debian/changelog b/debian/changelog
index fbf3f4a..1d8ced4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nouveau (1:1.0.11-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from debian-unstable: Remaining Ubuntu diff:
+- Add xmir support.
+  * Drop enabling vblank patch, enabled by default now.
+
+ -- Maarten Lankhorst   Wed, 10 Sep 2014 
14:46:13 +0200
+
 xserver-xorg-video-nouveau (1:1.0.11-1) unstable; urgency=low
 
   * New upstream release (Closes: #760265).
diff --git a/debian/control b/debian/control
index 1d8af16..3fb6eb3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
+ xserver-xorg-dev (>= 2:1.15.99.903),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/100-vblank-on.diff 
b/debian/patches/100-vblank-on.diff
deleted file mode 100644
index 46b18eb..000
--- a/debian/patches/100-vblank-on.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 271f641..0b92025 100644
 a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -932,6 +932,8 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
-   if (xf86GetOptValBool(pNv->Options, OPTION_GLX_VBLANK,
- &pNv->glx_vblank))
-   from = X_CONFIG;
-+  else
-+  pNv->glx_vblank = TRUE;
- 
-   xf86DrvMsg(pScrn->scrnIndex, from, "GLX sync to VBlank %s.\n",
-  pNv->glx_vblank ? "enabled" : "disabled");
diff --git a/debian/patches/series b/debian/patches/series
index 8dfdb49..723c9cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 
 # Ubuntu patches
 
-100-vblank-on.diff
 xmir.patch

commit cf2c01d075956ccbf3b38ae59641b20d7e1cec72
Author: Sven Joachim 
Date:   Sat Sep 6 09:56:49 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 233b719..244c986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-nouveau (1:1.0.11-1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.11-1) unstable; urgency=low
 
   * New upstream release (Closes: #760265).
   * Bump Standards-Version to 3.9.5, no changes needed.
   * Remove Cyril Brulebois from Uploaders.
   * Update debian/copyright.
 
- -- Sven Joachim   Wed, 03 Sep 2014 22:16:53 +0200
+ -- Sven Joachim   Sat, 06 Sep 2014 09:56:23 +0200
 
 xserver-xorg-video-nouveau (1:1.0.10-1) unstable; urgency=low
 

commit dd8a7ebacea8792a85e1441f0f3b6f5c06fef1ae
Author: Sven Joachim 
Date:   Thu Sep 4 21:46:56 2014 +0200

Let dpkg-source ignore changes to autogen.sh

This unused file is in the repository but not in tarballs, causing
warnings from dpkg-source and lintian.

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..ebfce44
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+extend-diff-ignore = ^autogen[.]sh$

commit 09bf16cedec336c0be0f4c8eca1598b1870ca72d
Author: Sven Joachim 
Date:   Thu Sep 4 21:35:49 2014 +0200

Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 97b1c88..233b719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-nouveau (1:1.0.11-1) UNRELEASED; urgency=low
   * New upstream release (Closes: #760265).
   * Bump Standards-Version to 3.9.5, no changes needed.
   * Remove Cyril Brulebois from Uploaders.
+  * Update debian/copyright.
 
  -- Sven Joachim   Wed, 03 Sep 2014 22:16:53 +0200
 
diff --git a/debian/copyright b/debi

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2014-07-17 Thread Maarten Lankhorst 
 debian/patches/xmir.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f282d6d67cd8fff7529b4b1b9c08e89d9cbdb6cd
Author: Maarten Lankhorst 
Date:   Wed Jul 16 16:51:48 2014 +0200

fix ftbfs

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 983e5b7..fe22b35 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -235,7 +235,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 +  NVPtr pNv = NVPTR(pScrn);
 +
 +  exaMoveInPixmap(ppix);
-+  if (!pNv->NoAccel)
++  if (pNv->AccelMethod == NONE)
 +  nouveau_bo_ref(nouveau_pixmap(ppix)->bo, &pNv->scanout);
 +  ppix->drawable.pScreen->devPrivate = ppix;
 +}


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1x7ibq-0005p9...@moszumanska.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2014-07-16 Thread Maarten Lankhorst 
 autogen.sh|4 
 configure.ac  |   15 +
 debian/patches/xmir.patch |  137 ++---
 man/nouveau.man   |   31 ++-
 src/Makefile.am   |   12 +
 src/drmmode_display.c |  300 ++---
 src/nouveau_copy.c|  129 
 src/nouveau_copy.h|   18 +
 src/nouveau_copy85b5.c|  104 ++
 src/nouveau_copy90b5.c|  100 +
 src/nouveau_copya0b5.c|   97 +
 src/nouveau_dri2.c|  463 --
 src/nouveau_exa.c |   54 ++---
 src/nouveau_glamor.c  |  246 
 src/nouveau_glamor.h  |   33 +++
 src/nouveau_present.c |  350 ++
 src/nouveau_present.h |   19 +
 src/nouveau_sync.c|  117 +++
 src/nouveau_sync.h|   34 +++
 src/nouveau_wfb.c |   12 -
 src/nouveau_xv.c  |   21 +-
 src/nv04_exa.c|2 
 src/nv50_accel.c  |   23 --
 src/nv50_exa.c|   59 -
 src/nv50_xv.c |2 
 src/nv_accel_common.c |  138 -
 src/nv_const.h|2 
 src/nv_dma.c  |  139 -
 src/nv_driver.c   |  245 
 src/nv_proto.h|   29 +-
 src/nv_type.h |   32 ++-
 src/nvc0_accel.c  |   27 --
 src/nvc0_accel.h  |2 
 src/nvc0_exa.c|  112 ---
 34 files changed, 2192 insertions(+), 916 deletions(-)

New commits:
commit 6b2de1e0e8ed425b6ae9e357295ef14a0ad84c1b
Author: Maarten Lankhorst 
Date:   Wed Jul 16 16:15:18 2014 +0200

refresh xmir patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 45324eb..983e5b7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,7 +8,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 
 --- a/src/nouveau_dri2.c
 +++ b/src/nouveau_dri2.c
-@@ -267,7 +267,7 @@
+@@ -275,7 +275,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
  
@@ -17,7 +17,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
return FALSE;
  
for (i = 0; i < xf86_config->num_crtc; i++) {
-@@ -290,7 +290,7 @@
+@@ -298,7 +298,7 @@
ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen);
NVPtr pNv = NVPTR(scrn);
  
@@ -26,8 +26,8 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
nv_window_belongs_to_crtc(scrn, draw->x, draw->y,
  draw->width, draw->height);
  }
-@@ -766,6 +766,19 @@
-   free(flip);
+@@ -951,6 +951,19 @@
+   return TRUE;
  }
  
 +#if DRI2INFOREC_VERSION >= 8 && defined(XMIR)
@@ -46,7 +46,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  Bool
  nouveau_dri2_init(ScreenPtr pScreen)
  {
-@@ -804,6 +817,11 @@
+@@ -992,6 +1005,11 @@
dri2.GetParam = NULL;
  #endif
  
@@ -60,16 +60,25 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -226,6 +226,8 @@
+@@ -231,6 +231,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
(*flag) = 0;
 +  if (xorgMir)
 +  *flag |= HW_SKIP_CONSOLE;
return TRUE;
-   default:
-   return FALSE;
-@@ -333,6 +335,23 @@
+ #if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,15,99,0,0)
+   case SUPPORTS_SERVER_FDS:
+@@ -309,6 +311,8 @@
+ #endif
+   if (fd != -1)
+   ret = nouveau_device_wrap(fd, 0, &dev);
++  else if (xorgMir)
++  nouveau_device_wrap(xmir_get_drm_fd(busid), 0, &dev);
+   else
+   ret = nouveau_device_open(busid, &dev);
+   if (ret)
+@@ -372,6 +376,23 @@
  }
  
  static Bool
@@ -93,27 +102,28 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
   intptr_t match_data)
  {
-@@ -343,6 +362,9 @@
+@@ -382,6 +403,10 @@
};
ScrnInfoPtr pScrn = NULL;
  
++
 +  if (xorgMir && !NVHasMirSupport(pci_dev))
 +  return FALSE;
 +
-   if (!NVHasKMS(pci_dev))
+   if (!NVHasKMS(pci_dev, NULL))
return FALSE;
  
-@@ -367,6 +389,9 @@
+@@ -406,6 +431,9 @@
if (!dev->pdev)
return FALSE;
  
 +  if (xorgMir && !NVHasMirSupport(dev->pdev))
 +  return FALSE;
 +
-   if (!NVHasKMS(dev->pdev))
+   if (!NVHasKMS(dev->pdev, dev))
return FALSE;
  
-@@ -406,7 +431,8 @@
+@@ -445,7 +473,8 @@
  NVAdjustFrame(ADJUST_FRAME_ARGS_DECL)
  {
SCRN_INFO_PTR(arg);
@@ -123,24 +133,28 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  }
  
  /*
-@@ -424,9 +450,11 @@
+@@ -462,7 +491,7 @@
+ #ifdef XF86_PDEV_SERVER_FD
+   NVEntPtr pNVEnt = NVEntPriv(pScrn);
+ #endif
+-  int ret;
++  int ret = 0;
  
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
  
--  ret = drmSetMaster(pNv->dev->fd);
--  if (ret)
--

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-08-29 Thread Christopher Halse Rogers 
 ChangeLog |17250 ++
 configure.ac  |5 
 debian/changelog  |   50 
 debian/control|   10 
 debian/patches/xmir.patch |  189 
 debian/rules  |4 
 src/Makefile.am   |   20 
 src/drmmode_display.c |   52 
 src/nouveau_xv.c  |   38 
 src/nv_driver.c   |2 
 src/nvc0_accel.c  |   33 
 src/shader/Makefile   |   15 
 src/shader/exac8nvf0.fp   |   42 
 src/shader/exac8nvf0.fpc  |   28 
 src/shader/exacanvf0.fp   |   43 
 src/shader/exacanvf0.fpc  |   30 
 src/shader/exacmnvf0.fp   |   43 
 src/shader/exacmnvf0.fpc  |   30 
 src/shader/exas8nvf0.fp   |   38 
 src/shader/exas8nvf0.fpc  |   20 
 src/shader/exasanvf0.fp   |   43 
 src/shader/exasanvf0.fpc  |   30 
 src/shader/exascnvf0.fp   |   35 
 src/shader/exascnvf0.fpc  |   14 
 src/shader/videonvf0.fp   |   47 
 src/shader/videonvf0.fpc  |   38 
 src/shader/xfrm2nvf0.vp   |   82 
 src/shader/xfrm2nvf0.vpc  |   90 
 28 files changed, 18194 insertions(+), 127 deletions(-)

New commits:
commit 63b75449ff7d5e810c03a18ccf66e309cea385d4
Author: Christopher James Halse Rogers 
Date:   Thu Aug 29 21:34:30 2013 +1000

Fix xserver build-dep version

diff --git a/debian/control b/debian/control
index cf706e6..91a555e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu2+xmirMM14~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit bcd598c2d7d3b22496514312d3b0801f6d2e7e81
Author: Christopher James Halse Rogers 
Date:   Mon Aug 26 17:29:29 2013 +1000

Update for new XMir API

diff --git a/debian/changelog b/debian/changelog
index a14fe33..306bbb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu4) saucy; urgency=low
+
+  * Update for new XMir API
+
+ -- Christopher James Halse Rogers   Thu, 22 Aug 2013 
14:42:58 +1000
+
 xserver-xorg-video-nouveau (1:1.0.8-0ubuntu3) saucy; urgency=low
 
   * Fix build against servers without XMir support
diff --git a/debian/control b/debian/control
index 70ce991..9c347e0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
+ xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu2+xmirMM14~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index ae77249..45324eb 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -6,10 +6,8 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 
 Signed-off-by: Christopher James Halse Rogers 
 
-Index: xf86-video-nouveau/src/nouveau_dri2.c
-===
 xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-06 12:40:27.802943906 
+1000
-+++ xf86-video-nouveau/src/nouveau_dri2.c  2013-08-06 12:40:27.798943906 
+1000
+--- a/src/nouveau_dri2.c
 b/src/nouveau_dri2.c
 @@ -267,7 +267,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
@@ -60,10 +58,8 @@ Index: xf86-video-nouveau/src/nouveau_dri2.c
  #if DRI2INFOREC_VERSION >= 9
dri2.version = 9;
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
-Index: xf86-video-nouveau/src/nv_driver.c
-===
 xf86-video-nouveau.orig/src/nv_driver.c2013-08-06 12:40:27.802943906 
+1000
-+++ xf86-video-nouveau/src/nv_driver.c 2013-08-06 12:44:47.126932579 +1000
+--- a/src/nv_driver.c
 b/src/nv_driver.c
 @@ -226,6 +226,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
@@ -117,7 +113,17 @@ Index: xf86-video-nouveau/src/nv_driver.c
if (!NVHasKMS(dev->pdev))
return FALSE;
  
-@@ -424,9 +449,11 @@
+@@ -406,7 +431,8 @@
+ NVAdjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+   SCRN_INFO_PTR(arg);
+-  drmmode_adjust_frame(pScrn, x, y);
++  if (!xorgMir)
++  drmmode_adjust_frame(pScrn, x, y);
+ }
+ 
+ /*
+@@ -424,9 +450,11 @@
  
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
  
@@ -132,7 +138,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
  
if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc && 
!xf86SetDesiredModes(pScrn))
return FALSE;
-@@ -452,6 +479,9 @@
+@@ -452,6 +480,9 @@
  
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
  
@@ -142,106 +148,89 @@ Index: xf86-video-nouveau/src/nv_driver.c
ret = drmDropMaster(pNv->dev->fd);
if (ret && errno != EIO && errno != ENODEV)
ErrorF("Error dropping master: %i(%m)\n", -errno);
-@@ -501,6 +531,86 @@
+@@ -501,6 +532,50 @@
  }
  #endif
  
 +#ifdef XMIR
 +static void
-+nouveau_xmir_copy_pixmap_to_mir(PixmapPtr src, i

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-08-08 Thread Christopher Halse Rogers 
 debian/changelog  |6 ++
 debian/patches/xmir.patch |   22 --
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 5aa069ec224fa232d9374b1476a32a383a9137d2
Author: Christopher James Halse Rogers 
Date:   Tue Aug 6 12:48:34 2013 +1000

Fix build against !XMir servers

diff --git a/debian/changelog b/debian/changelog
index 7e5adb6..a14fe33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu3) saucy; urgency=low
+
+  * Fix build against servers without XMir support
+
+ -- Christopher James Halse Rogers   Tue, 06 Aug 2013 
12:47:46 +1000
+
 xserver-xorg-video-nouveau (1:1.0.8-0ubuntu2) saucy; urgency=low
 
   * Add XMir support
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 94ce066..ae77249 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,8 +8,8 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 
 Index: xf86-video-nouveau/src/nouveau_dri2.c
 ===
 xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nouveau_dri2.c  2013-08-01 20:57:06.740921258 
+1000
+--- xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nouveau_dri2.c  2013-08-06 12:40:27.798943906 
+1000
 @@ -267,7 +267,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
@@ -62,8 +62,8 @@ Index: xf86-video-nouveau/src/nouveau_dri2.c
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
 Index: xf86-video-nouveau/src/nv_driver.c
 ===
 xf86-video-nouveau.orig/src/nv_driver.c2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nv_driver.c 2013-08-01 20:57:40.208921211 +1000
+--- xf86-video-nouveau.orig/src/nv_driver.c2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nv_driver.c 2013-08-06 12:44:47.126932579 +1000
 @@ -226,6 +226,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
@@ -318,20 +318,22 @@ Index: xf86-video-nouveau/src/nv_driver.c
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
pNv->HWCursor ? "HW" : "SW");
  
-@@ -1062,7 +1196,11 @@
+@@ -1062,7 +1196,13 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Swap limit set to %d [Max allowed 
%d]%s\n",
   pNv->swap_limit, pNv->max_swap_limit, reason);
  
 -  ret = drmmode_pre_init(pScrn, pNv->dev->fd, pScrn->bitsPerPixel >> 3);
++#ifdef XMIR
 +  if (xorgMir) {
 +  xmir_screen_pre_init(pScrn, pNv->xmir, &xmir_nouveau_driver);
 +  ret = TRUE;
 +  } else
++#endif
 +  ret = drmmode_pre_init(pScrn, pNv->dev->fd, pScrn->bitsPerPixel 
>> 3);
if (ret == FALSE)
NVPreInitFail("Kernel modesetting failed to initialize\n");
  
-@@ -1170,7 +1308,8 @@
+@@ -1170,7 +1310,8 @@
  {
NVPtr pNv = NVPTR(pScrn);
  
@@ -341,7 +343,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
  
nouveau_bo_ref(NULL, &pNv->transfer);
nouveau_bo_ref(NULL, &pNv->scanout);
-@@ -1370,6 +1509,11 @@
+@@ -1370,6 +1511,11 @@
else
fbPictureInit (pScreen, 0, 0);
  
@@ -353,7 +355,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
xf86SetBlackWhitePixels(pScreen);
  
if (!pNv->NoAccel && !nouveau_exa_init(pScreen))
-@@ -1443,19 +1587,19 @@
+@@ -1443,19 +1589,19 @@
 * Initialize colormap layer.
 * Must follow initialization of the default colormap 
 */
@@ -378,8 +380,8 @@ Index: xf86-video-nouveau/src/nv_driver.c
  
 Index: xf86-video-nouveau/src/nv_type.h
 ===
 xf86-video-nouveau.orig/src/nv_type.h  2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nv_type.h   2013-08-01 20:57:06.740921258 +1000
+--- xf86-video-nouveau.orig/src/nv_type.h  2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nv_type.h   2013-08-06 12:40:27.798943906 +1000
 @@ -9,6 +9,14 @@
  #include 
  #include "xf86Crtc.h"


-- 
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/e1v7ygn-0005tt...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-08-02 Thread Christopher Halse Rogers 
 debian/changelog  |6 
 debian/control|2 
 debian/patches/series |1 
 debian/patches/xmir.patch |  406 ++
 4 files changed, 414 insertions(+), 1 deletion(-)

New commits:
commit c47e57c97b4f3a51b82718ce1cd5efeba787606b
Author: Christopher James Halse Rogers 
Date:   Fri Aug 2 20:41:29 2013 +1000

Add XMir support

diff --git a/debian/changelog b/debian/changelog
index 709b3f6..7e5adb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu2) saucy; urgency=low
+
+  * Add XMir support
+
+ -- Christopher James Halse Rogers   Thu, 01 Aug 2013 
20:58:29 +1000
+
 xserver-xorg-video-nouveau (1:1.0.8-0ubuntu1) saucy; urgency=low
 
   * Sync to unreleased debian experimental git.
diff --git a/debian/control b/debian/control
index 8e919c1..70ce991 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/series b/debian/patches/series
index e8e209c..8dfdb49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 # Ubuntu patches
 
 100-vblank-on.diff
+xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
new file mode 100644
index 000..94ce066
--- /dev/null
+++ b/debian/patches/xmir.patch
@@ -0,0 +1,406 @@
+commit 4515628ff78e07aea0d661ff3fd999c29cc55259
+Author: Christopher James Halse Rogers 
+Date:   Mon Jul 22 17:46:58 2013 +1000
+
+Support running nested in a Mir compositor
+
+Signed-off-by: Christopher James Halse Rogers 
+
+Index: xf86-video-nouveau/src/nouveau_dri2.c
+===
+--- xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-01 20:57:06.744921258 
+1000
 xf86-video-nouveau/src/nouveau_dri2.c  2013-08-01 20:57:06.740921258 
+1000
+@@ -267,7 +267,7 @@
+   NVPtr pNv = NVPTR(scrn);
+   int i;
+ 
+-  if (!xf86_config->num_crtc)
++  if (xorgMir || !xf86_config->num_crtc)
+   return FALSE;
+ 
+   for (i = 0; i < xf86_config->num_crtc; i++) {
+@@ -290,7 +290,7 @@
+   ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen);
+   NVPtr pNv = NVPTR(scrn);
+ 
+-  return pNv->glx_vblank &&
++  return pNv->glx_vblank && !xorgMir &&
+   nv_window_belongs_to_crtc(scrn, draw->x, draw->y,
+ draw->width, draw->height);
+ }
+@@ -766,6 +766,19 @@
+   free(flip);
+ }
+ 
++#if DRI2INFOREC_VERSION >= 8 && defined(XMIR)
++static int nouveau_dri2_auth_magic(ScreenPtr pScreen, uint32_t magic)
++{
++ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
++NVPtr pNv = NVPTR(pScrn);
++
++if (xorgMir)
++  return xmir_auth_drm_magic(pNv->xmir, magic);
++else
++  return drmAuthMagic(pNv->dev->fd, magic);
++}
++#endif
++
+ Bool
+ nouveau_dri2_init(ScreenPtr pScreen)
+ {
+@@ -804,6 +817,11 @@
+   dri2.GetParam = NULL;
+ #endif
+ 
++#if DRI2INFOREC_VERSION >= 8 && defined(XMIR)
++  dri2.version = 8;
++  dri2.AuthMagic2 = nouveau_dri2_auth_magic;
++#endif
++
+ #if DRI2INFOREC_VERSION >= 9
+   dri2.version = 9;
+   dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
+Index: xf86-video-nouveau/src/nv_driver.c
+===
+--- xf86-video-nouveau.orig/src/nv_driver.c2013-08-01 20:57:06.744921258 
+1000
 xf86-video-nouveau/src/nv_driver.c 2013-08-01 20:57:40.208921211 +1000
+@@ -226,6 +226,8 @@
+   case GET_REQUIRED_HW_INTERFACES:
+   flag = (CARD32 *)data;
+   (*flag) = 0;
++  if (xorgMir)
++  *flag |= HW_SKIP_CONSOLE;
+   return TRUE;
+   default:
+   return FALSE;
+@@ -333,6 +335,23 @@
+ }
+ 
+ static Bool
++NVHasMirSupport(struct pci_device *pci_dev)
++{
++  char *busid;
++
++  busid = XNFprintf("pci:%04x:%02x:%02x.%d",
++pci_dev->domain, pci_dev->bus, pci_dev->dev, 
pci_dev->func);
++
++  if (xmir_get_drm_fd(busid) < 0) {
++  xf86DrvMsg(-1, X_ERROR, "[XMir] GPU %s not handled by Mir\n", 
busid);
++  free(busid);
++  return FALSE;
++  }
++  free(busid);
++  return TRUE;
++}
++
++static Bool
+ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
+  intptr_t match_data)
+ {
+@@ -343,6 +362,9 @@
+   };
+   ScrnInfoPtr pScrn = NULL;
+ 
++  if (xorgMir && !NVHasMirSupport(pci_dev))
++  return FALSE;
++
+   if (!NVHasKMS(pci_dev))
+   return FALSE;
+ 
+@@ -367,6 +389,9 @@
+   if (!dev->pdev)
+   return FALSE;
+ 
++  if (xorgMir && !NVHasMirSupport(dev->pdev))
++  return FALSE;
++
+   if (!NVHasKMS(dev->p

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-06-12 Thread Maarten Lankhorst 
 .gitignore   |2 
 ChangeLog|16944 ---
 Makefile.am  |   15 
 configure.ac |   35 
 debian/changelog |   36 
 debian/control   |2 
 debian/rules |   11 
 src/Makefile.am  |   35 
 src/drmmode_display.c|   40 
 src/nouveau_dri2.c   |   19 
 src/nouveau_xv.c |4 
 src/nv_accel_common.c|5 
 src/nv_driver.c  |  146 
 src/nv_proto.h   |1 
 src/nv_type.h|   14 
 src/nvc0_accel.c |   45 
 src/nvc0_shader.h|  444 -
 src/nve0_shader.h|  440 -
 src/shader/.gitignore|1 
 src/shader/Makefile  |   30 
 src/shader/exac8nvc0.fp  |   41 
 src/shader/exac8nvc0.fpc |   22 
 src/shader/exac8nve0.fp  |   42 
 src/shader/exac8nve0.fpc |   28 
 src/shader/exacanvc0.fp  |   41 
 src/shader/exacanvc0.fpc |   25 
 src/shader/exacanve0.fp  |   43 
 src/shader/exacanve0.fpc |   30 
 src/shader/exacmnvc0.fp  |   41 
 src/shader/exacmnvc0.fpc |   25 
 src/shader/exacmnve0.fp  |   43 
 src/shader/exacmnve0.fpc |   30 
 src/shader/exas8nvc0.fp  |   37 
 src/shader/exas8nvc0.fpc |   14 
 src/shader/exas8nve0.fp  |   38 
 src/shader/exas8nve0.fpc |   20 
 src/shader/exasanvc0.fp  |   41 
 src/shader/exasanvc0.fpc |   25 
 src/shader/exasanve0.fp  |   43 
 src/shader/exasanve0.fpc |   30 
 src/shader/exascnvc0.fp  |   34 
 src/shader/exascnvc0.fpc |   11 
 src/shader/exascnve0.fp  |   35 
 src/shader/exascnve0.fpc |   14 
 src/shader/videonvc0.fp  |   47 
 src/shader/videonvc0.fpc |   37 
 src/shader/videonve0.fp  |   50 
 src/shader/videonve0.fpc |   44 
 src/shader/xfrm2nvc0.vp  |   63 
 src/shader/xfrm2nvc0.vpc |   69 
 src/shader/xfrm2nve0.vp  |   63 
 src/shader/xfrm2nve0.vpc |   70 
 52 files changed, 1522 insertions(+), 17943 deletions(-)

New commits:
commit 4f1a24481f5b7a123bbb9f042cf7683b10dcfd7e
Author: Maarten Lankhorst 
Date:   Wed Jun 12 11:30:52 2013 +0200

release to saucy

diff --git a/debian/changelog b/debian/changelog
index 39c0682..709b3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu1) saucy; urgency=low
+
+  * Sync to unreleased debian experimental git.
+  * Remaining differences:
+- Try to enable vblank if available (LP: #1019131)
+  - 100-vblank-on.diff
+  * Add support for displayless cards. (LP: #1142733)
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
11:24:18 +0200
+
 xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit a3dd588c4392e59ea52f814f6eb80f4635465b16
Author: Maarten Lankhorst 
Date:   Wed Jun 12 11:16:38 2013 +0200

Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.

Upstream removed dri1 dependency.

diff --git a/debian/changelog b/debian/changelog
index 6b643e1..5d56bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Replace dependency on x11proto-xf86dri-dev with x11proto-dri2-dev.
+- Upstream removed dri1 dependency.
 
  -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
 
diff --git a/debian/control b/debian/control
index 4975203..486fc7e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-xext-dev,
  libdrm-dev (>= 2.4.40-1),
- x11proto-xf86dri-dev,
+ x11proto-dri2-dev,
  x11proto-gl-dev,
  mesa-common-dev,
  libudev-dev,

commit dbb64a8e0cade7f8e85f75090d1f1a7ae8980ab8
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:59:11 2013 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 84c8d87..6b643e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
10:58:45 +0200
+
 xserver-xorg-video-nouveau (1:1.0.7-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]

commit 7f20a6af25ae28452ec9c971bfa2227857e6ee93
Author: Maarten Lankhorst 
Date:   Wed Jun 12 10:46:39 2013 +0200

bump to 1.0.8

diff --git a/configure.ac b/configure.ac
index 575f69d..bf19d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-nouveau],
-[1.0.7],
+[1.0.8],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-nouveau])
 

commit 1fda669c0e5a25eac7f9f1e9a743120cae50ff51
Author: Emil Velikov 
Date:   Sat Feb 16 20:48:47 2013 +

configure: printout the configuration info

Let the bikeshedding begin

Signed-off-by: Emil Velikov 

diff --git a/configure.ac b/configure.ac
index 4f9f0b1..575f69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,3 +132,21 @@ AC_CONFIG_FILES([
man/Makefile
 ])
 AC_OUTPUT
+
+dnl
+dnl Output some configur

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-03-27 Thread Maarten Lankhorst 
 ChangeLog  |  125 
 configure.ac   |2 
 debian/changelog   |   19 +
 debian/patches/101-git-a80785f792.diff |  477 -
 debian/patches/102-fixup-close.diff|   77 -
 debian/patches/series  |2 
 src/drmmode_display.c  |   57 +++
 src/nouveau_dri2.c |   18 +
 src/nouveau_exa.c  |5 
 src/nv30_exa.c |  272 +-
 src/nv_accel_common.c  |   13 
 src/nv_driver.c|   11 
 12 files changed, 375 insertions(+), 703 deletions(-)

New commits:
commit 171572d3319e8cfdd4c12cd23b35d0bd002eca3d
Author: Maarten Lankhorst 
Date:   Wed Mar 27 13:43:37 2013 +0100

release to raring

diff --git a/debian/changelog b/debian/changelog
index 6f60aa1..68d35af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:1.0.7-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.7-0ubuntu1) raring; urgency=low
 
   * Sync to unreleased debian experimental git.
   * Remaining differences:

commit b4c9ce0da253241b6630bcbef04ca47eabf06b59
Author: Maarten Lankhorst 
Date:   Wed Mar 27 13:41:40 2013 +0100

Sync to unreleased debian experimental git.

* Sync to unreleased debian experimental git.
* Remaining differences:
  - Try to enable vblank if available (LP: #1019131)
- 100-vblank-on.diff

diff --git a/debian/changelog b/debian/changelog
index 58bd3e1..6f60aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-nouveau (1:1.0.7-0ubuntu1) UNRELEASED; urgency=low
+
+  * Sync to unreleased debian experimental git.
+  * Remaining differences:
+- Try to enable vblank if available (LP: #1019131)
+  - 100-vblank-on.diff
+
+ -- Maarten Lankhorst   Wed, 27 Mar 2013 
13:37:09 +0100
+
 xserver-xorg-video-nouveau (1:1.0.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/101-git-a80785f792.diff 
b/debian/patches/101-git-a80785f792.diff
deleted file mode 100644
index 80aaf90..000
--- a/debian/patches/101-git-a80785f792.diff
+++ /dev/null
@@ -1,477 +0,0 @@
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 429e9cc..9eca60f 100644
 a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -42,6 +42,7 @@
- #include "libudev.h"
- #endif
- 
-+static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height);
- typedef struct {
- int fd;
- uint32_t fb_id;
-@@ -345,6 +346,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr 
mode,
-   drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
- 
-   fb_id = drmmode->fb_id;
-+#ifdef NOUVEAU_PIXMAP_SHARING
-+  if (crtc->randr_crtc->scanout_pixmap)
-+  x = y = 0;
-+  else
-+#endif
-   if (drmmode_crtc->rotate_fb_id) {
-   fb_id = drmmode_crtc->rotate_fb_id;
-   x = 0;
-@@ -536,6 +542,35 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 
*green, CARD16 *blue,
-   }
- }
- 
-+#ifdef NOUVEAU_PIXMAP_SHARING
-+static Bool
-+drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
-+{
-+  ScreenPtr screen = xf86ScrnToScreen(crtc->scrn);
-+  PixmapPtr screenpix = screen->GetScreenPixmap(screen);
-+
-+  if (!ppix) {
-+  if (crtc->randr_crtc->scanout_pixmap)
-+  
PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
-+  return TRUE;
-+  }
-+
-+  if (ppix->drawable.width > screenpix->drawable.width ||
-+  ppix->drawable.height > screenpix->drawable.height) {
-+  Bool ret;
-+  ret = drmmode_xf86crtc_resize(crtc->scrn, ppix->drawable.width, 
ppix->drawable.height);
-+  if (ret == FALSE)
-+  return FALSE;
-+
-+  screenpix = screen->GetScreenPixmap(screen);
-+  screen->width = screenpix->drawable.width = 
ppix->drawable.width;
-+  screen->height = screenpix->drawable.height = 
ppix->drawable.height;
-+  }
-+  PixmapStartDirtyTracking(ppix, screenpix, 0, 0);
-+  return TRUE;
-+}
-+#endif
-+
- static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
-   .dpms = drmmode_crtc_dpms,
-   .set_mode_major = drmmode_set_mode_major,
-@@ -547,6 +582,10 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
-   .shadow_allocate = drmmode_crtc_shadow_allocate,
-   .shadow_destroy = drmmode_crtc_shadow_destroy,
-   .gamma_set = drmmode_gamma_set,
-+
-+#ifdef NOUVEAU_PIXMAP_SHARING
-+  .set_scanout_pixmap = drmmode_set_scanout_pixmap,
-+#endif
- };
- 
- 
-@@ -567,7 +606,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, 
int num)
-drmmode->mode_res->crtcs[num]);
-   drmmode_crtc->drmmode = drmmode;
- 
--  ret =

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-03-27 Thread Maarten Lankhorst 
 debian/changelog|7 +++
 debian/patches/102-fixup-close.diff |   77 
 debian/patches/series   |1 
 3 files changed, 85 insertions(+)

New commits:
commit 0fd415f5c89966c3ae8f03cecb9f429570caadea
Author: Maarten Lankhorst 
Date:   Wed Mar 27 09:47:48 2013 +0100

release to raring

diff --git a/debian/changelog b/debian/changelog
index 15d078e..133724b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-nouveau (1:1.0.6-0ubuntu4) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu4) raring; urgency=low
 
   * Clean up (forced) device close (LP: #1157614)
 - 102-fixup-close.diff
 
- -- Maarten Lankhorst   Mon, 25 Mar 2013 
13:59:55 +0100
+ -- Maarten Lankhorst   Mon, 25 Mar 2013 
14:01:46 +0100
 
 xserver-xorg-video-nouveau (1:1.0.6-0ubuntu3) raring; urgency=low
 

commit f16680f9dd6fd0adf36741692150f46dafc88894
Author: Maarten Lankhorst 
Date:   Mon Mar 25 14:01:06 2013 +0100

Clean up (forced) device close (LP: #1157614)

102-fixup-close.diff

diff --git a/debian/changelog b/debian/changelog
index f30ada1..15d078e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu4) UNRELEASED; urgency=low
+
+  * Clean up (forced) device close (LP: #1157614)
+- 102-fixup-close.diff
+
+ -- Maarten Lankhorst   Mon, 25 Mar 2013 
13:59:55 +0100
+
 xserver-xorg-video-nouveau (1:1.0.6-0ubuntu3) raring; urgency=low
 
   * Remove individual patches, sync to git a80785f792 to pick up some fixes.
diff --git a/debian/patches/102-fixup-close.diff 
b/debian/patches/102-fixup-close.diff
new file mode 100644
index 000..b9a6108
--- /dev/null
+++ b/debian/patches/102-fixup-close.diff
@@ -0,0 +1,77 @@
+--- a/src/drmmode_display.c
 b/src/drmmode_display.c
+@@ -627,6 +627,9 @@
+   drmmode_output->mode_output =
+   drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
+ 
++  if (!drmmode_output->mode_output)
++  return XF86OutputStatusDisconnected;
++
+   switch (drmmode_output->mode_output->connection) {
+   case DRM_MODE_CONNECTED:
+   status = XF86OutputStatusConnected;
+@@ -663,6 +666,9 @@
+   drmModePropertyPtr props;
+   xf86MonPtr ddc_mon = NULL;
+ 
++  if (!koutput)
++  return NULL;
++
+   /* look for an EDID property */
+   for (i = 0; i < koutput->count_props; i++) {
+   props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
+@@ -927,6 +933,9 @@
+   drmModeGetConnector(drmmode->fd, 
drmmode_output->output_id);
+   }
+ 
++  if (!drmmode_output->mode_output)
++  return FALSE;
++
+   for (i = 0; i < drmmode_output->num_props; i++) {
+   drmmode_prop_ptr p = &drmmode_output->props[i];
+   if (p->atoms[0] != property)
+@@ -1437,6 +1446,7 @@
+   if (drmmode->uevent_monitor) {
+   struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
+ 
++  
RemoveGeneralSocket(udev_monitor_get_fd(drmmode->uevent_monitor));
+   udev_monitor_unref(drmmode->uevent_monitor);
+   udev_unref(u);
+   }
+@@ -1524,6 +1534,12 @@
+ drmmode_screen_fini(ScreenPtr pScreen)
+ {
+   ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
++  drmmode_ptr drmmode = drmmode_from_scrn(scrn);
+ 
+   drmmode_uevent_fini(scrn);
++
++  /* Register a wakeup handler to get informed on DRM events */
++  RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
++   drmmode_wakeup_handler, scrn);
++  RemoveGeneralSocket(drmmode->fd);
+ }
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -432,8 +432,8 @@
+   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");
+ 
+   ret = drmDropMaster(pNv->dev->fd);
+-  if (ret)
+-  ErrorF("Error dropping master: %d\n", ret);
++  if (ret && errno != EIO && errno != ENODEV)
++  ErrorF("Error dropping master: %i(%m)\n", -errno);
+ }
+ 
+ static void
+@@ -624,8 +624,9 @@
+ {
+   NVPtr pNv = NVPTR(pScrn);
+ 
+-  nouveau_device_del(&pNv->dev);
+   drmFree(pNv->drm_device_name);
++  nouveau_client_del(&pNv->client);
++  nouveau_device_del(&pNv->dev);
+ }
+ 
+ static Bool
diff --git a/debian/patches/series b/debian/patches/series
index fdf7b34..3822187 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 
 100-vblank-on.diff
 101-git-a80785f792.diff
+102-fixup-close.diff


-- 
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/e1ukm2a-0002js...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu-quantal'

2013-02-28 Thread Maarten Lankhorst 
 debian/changelog|  
  7 ++
 debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch |  
 30 ++
 debian/patches/series   |  
  1 
 3 files changed, 38 insertions(+)

New commits:
commit d5bb0af2f720c0c3be3ac1fceacdc96152711e63
Author: Maarten Lankhorst 
Date:   Thu Feb 28 12:55:29 2013 +0100

release to quantal proposed without the kwin fix

diff --git a/debian/changelog b/debian/changelog
index 1a4503a..03c8acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.3-0ubuntu0.2) quantal-proposed; urgency=low
+
+  * Revert kwin fix, it caused a regression.
+- 101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
+
+ -- Maarten Lankhorst   Thu, 28 Feb 2013 
12:35:09 +0100
+
 xserver-xorg-video-nouveau (1:1.0.3-0ubuntu0.1) quantal-proposed; urgency=low
 
   [ Maarten Lankhorst ]
diff --git 
a/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch 
b/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
new file mode 100644
index 000..a91a770
--- /dev/null
+++ 
b/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
@@ -0,0 +1,30 @@
+From a8eb53e3df94199be59ca59d19543b233d49bc2f Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst 
+Date: Thu, 28 Feb 2013 12:33:43 +0100
+Subject: [PATCH] Revert "nouveau/dri2: fix pixmap/window offset calcs."
+
+This reverts commit 297fd0d0755bda698be1d0b30cc60a41d7673c0b.
+---
+ src/nouveau_dri2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
+index 8d21dca..bf69505 100644
+--- a/src/nouveau_dri2.c
 b/src/nouveau_dri2.c
+@@ -165,9 +165,9 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr 
pDraw, RegionPtr pRegio
+   translate = TRUE;
+ 
+   if (translate && pDraw->type == DRAWABLE_WINDOW) {
+-  PixmapPtr pPix = get_drawable_pixmap(pDraw);
+-  off_x = pDraw->x - pPix->screen_x;
+-  off_y = pDraw->y - pPix->screen_y;
++  WindowPtr pWin = (WindowPtr)pDraw;
++  off_x = pWin->origin.x;
++  off_y = pWin->origin.y;
+   }
+ 
+   pGC = GetScratchGC(pDraw->depth, pScreen);
+-- 
+1.8.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e8e209c..8404ed3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 # Ubuntu patches
 
 100-vblank-on.diff
+101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch


-- 
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/e1ub267-0003wn...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu-quantal'

2013-02-28 Thread Maarten Lankhorst 
Rebased ref, commits from common ancestor:


-- 
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/e1ub1eu-0002cf...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu-quantal'

2013-02-28 Thread Maarten Lankhorst 
New branch 'ubuntu-quantal' available with the following commits:


-- 
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/e1ub1ee-0002bo...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-02-20 Thread Maarten Lankhorst 
 debian/changelog   |   18 +
 debian/patches/101-git-a80785f792.diff |  477 +
 debian/patches/series  |1 
 3 files changed, 496 insertions(+)

New commits:
commit 43a56f086be3d11452dddf69be3c259e04f2c5b7
Author: Maarten Lankhorst 
Date:   Tue Feb 19 17:39:21 2013 +0100

Remove individual cherry-picked commits, and sync to git a80785f792 to pick 
up some fixes.

Mostly import for fixes to reverse prime support.

diff --git a/debian/changelog b/debian/changelog
index edcddf8..f30ada1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-xserver-xorg-video-nouveau (1:1.0.6-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu3) raring; urgency=low
+
+  * Remove individual patches, sync to git a80785f792 to pick up some fixes.
+- Mostly import for fixes to reverse prime support.
+  * This hopefully fixes (LP: #1124693)
+
+ -- Maarten Lankhorst   Tue, 19 Feb 2013 
17:34:52 +0100
+
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu2) raring; urgency=low
 
   * Cherry-pick upstream patches to sync with git 58284cf32
 - 101-gart-cursor.patch
diff --git a/debian/patches/101-gart-cursor.patch 
b/debian/patches/101-gart-cursor.patch
deleted file mode 100644
index b246931..000
--- a/debian/patches/101-gart-cursor.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 912d418fdfd2e99eef1e5c631c76dda1d82cf451
-Author: Marcin Slusarz 
-Date:   Mon Jan 21 00:15:38 2013 +0100
-
-nouveau: put cursor BO in GART
-
-Keeping it in VRAM wastes CPU time, because cursor_set ioctl reads
-handed BO back to RAM, just to write it to actual cursor BO.
-
-Here (nv92/core i7), this patch decreases overall cpu usage of
-drmmode_load_cursor_argb from 4.6ms to ~90us and lets nv50_crtc_cursor_set
-disappear from perf traces.
-
-Signed-off-by: Ben Skeggs 
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 429e9cc..06f7a24 100644
 a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -567,7 +567,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, 
int num)
-drmmode->mode_res->crtcs[num]);
-   drmmode_crtc->drmmode = drmmode;
- 
--  ret = nouveau_bo_new(pNv->dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_MAP, 0,
-+  ret = nouveau_bo_new(pNv->dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 0,
-64*64*4, NULL, &drmmode_crtc->cursor);
-   assert(ret == 0);
- 
diff --git a/debian/patches/101-git-a80785f792.diff 
b/debian/patches/101-git-a80785f792.diff
new file mode 100644
index 000..80aaf90
--- /dev/null
+++ b/debian/patches/101-git-a80785f792.diff
@@ -0,0 +1,477 @@
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 429e9cc..9eca60f 100644
+--- a/src/drmmode_display.c
 b/src/drmmode_display.c
+@@ -42,6 +42,7 @@
+ #include "libudev.h"
+ #endif
+ 
++static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height);
+ typedef struct {
+ int fd;
+ uint32_t fb_id;
+@@ -345,6 +346,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr 
mode,
+   drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
+ 
+   fb_id = drmmode->fb_id;
++#ifdef NOUVEAU_PIXMAP_SHARING
++  if (crtc->randr_crtc->scanout_pixmap)
++  x = y = 0;
++  else
++#endif
+   if (drmmode_crtc->rotate_fb_id) {
+   fb_id = drmmode_crtc->rotate_fb_id;
+   x = 0;
+@@ -536,6 +542,35 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 
*green, CARD16 *blue,
+   }
+ }
+ 
++#ifdef NOUVEAU_PIXMAP_SHARING
++static Bool
++drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
++{
++  ScreenPtr screen = xf86ScrnToScreen(crtc->scrn);
++  PixmapPtr screenpix = screen->GetScreenPixmap(screen);
++
++  if (!ppix) {
++  if (crtc->randr_crtc->scanout_pixmap)
++  
PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
++  return TRUE;
++  }
++
++  if (ppix->drawable.width > screenpix->drawable.width ||
++  ppix->drawable.height > screenpix->drawable.height) {
++  Bool ret;
++  ret = drmmode_xf86crtc_resize(crtc->scrn, ppix->drawable.width, 
ppix->drawable.height);
++  if (ret == FALSE)
++  return FALSE;
++
++  screenpix = screen->GetScreenPixmap(screen);
++  screen->width = screenpix->drawable.width = 
ppix->drawable.width;
++  screen->height = screenpix->drawable.height = 
ppix->drawable.height;
++  }
++  PixmapStartDirtyTracking(ppix, screenpix, 0, 0);
++  return TRUE;
++}
++#endif
++
+ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+   .dpms = drmmode_crtc_dpms,
+   .set_mode_major = drmmode_set_mode_major,
+@@ -547,6 +582,10 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
+   .shadow_allocate = drmmode_crtc_shadow_a

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-01-07 Thread Maarten Lankhorst 
 ChangeLog  |   54 +
 configure.ac   |2 -
 debian/changelog   |   35 +-
 debian/control |5 +-
 debian/patches/02-kms-edid-block-fix.patch |   30 
 debian/patches/series  |1 
 debian/source/lintian-overrides|2 +
 src/drmmode_display.c  |9 +++-
 src/nv_driver.c|3 +
 src/nvc0_shader.h  |4 +-
 src/nve0_shader.h  |4 +-
 11 files changed, 104 insertions(+), 45 deletions(-)

New commits:
commit fae3255aef04f209ce53f196e47028af5e043558
Author: Maarten Lankhorst 
Date:   Mon Jan 7 14:33:26 2013 +0100

release to raring

diff --git a/debian/changelog b/debian/changelog
index b6167ad..bf53fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:1.0.6-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu1) raring; urgency=low
 
   * Sync from unreleased debian experimental git.
   * Remaining differences:

commit f50aff8ea4531826e0807339f83a21217c27c67a
Author: Maarten Lankhorst 
Date:   Mon Jan 7 14:22:55 2013 +0100

Remove 02-kms-edid-block-fix.patch, upstreamed.

diff --git a/debian/changelog b/debian/changelog
index d27dac3..7d948a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-nouveau (1:1.0.6-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
+  * Remove 02-kms-edid-block-fix.patch, upstreamed.
 
  -- Sven Joachim   Sun, 06 Jan 2013 14:56:59 +0100
 
diff --git a/debian/patches/02-kms-edid-block-fix.patch 
b/debian/patches/02-kms-edid-block-fix.patch
deleted file mode 100644
index ea7aa15..000
--- a/debian/patches/02-kms-edid-block-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 3b33a0b426b8915f302247dcd40c64fb1a6dcdd2
-Author: Emil Velikov 
-Date:   Sun Nov 4 18:06:18 2012 +
-
-kms: Let the server know if we got more than 1 EDID block
-
-Verbatim copy from xf86-video-radeon commit 809cacb
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32341
-Signed-off-by: Emil Velikov 
-Signed-off-by: Ben Skeggs 
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 803785d..8ec69f5 100644
 a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -640,9 +640,12 @@ drmmode_output_get_modes(xf86OutputPtr output)
-   drmModeFreeProperty(props);
-   }
- 
--  if (drmmode_output->edid_blob)
-+  if (drmmode_output->edid_blob) {
-   ddc_mon = xf86InterpretEDID(output->scrn->scrnIndex,
-   drmmode_output->edid_blob->data);
-+  if (ddc_mon && drmmode_output->edid_blob->length > 128)
-+  ddc_mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
-+  }
-   xf86OutputSetEDID(output, ddc_mon);
- 
-   /* modes should already be available */
diff --git a/debian/patches/series b/debian/patches/series
index b256273..d6892cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
-02-kms-edid-block-fix.patch

commit b5324fccf484cc468ab2dc6871c53b997af0750e
Author: Maarten Lankhorst 
Date:   Mon Jan 7 14:20:07 2013 +0100

Sync from unreleased debian experimental git.

* Sync from unreleased debian experimental git.
* Remaining differences:
  - Try to enable vblank if available (LP: #1019131)
- 100-vblank-on.diff

diff --git a/debian/changelog b/debian/changelog
index 4c8f5cb..c3fb7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-nouveau (1:1.0.6-0ubuntu1) raring; urgency=low
+
+  * Sync from unreleased debian experimental git.
+  * Remaining differences:
+- Try to enable vblank if available (LP: #1019131)
+  - 100-vblank-on.diff
+
+ -- Maarten Lankhorst   Mon, 07 Jan 2013 
14:16:08 +0100
+
 xserver-xorg-video-nouveau (1:1.0.6-1) UNRELEASED; urgency=low
 
   [ Sven Joachim ]

commit 74d397e6bbd88e778ba4f4b7608f8fee00a62682
Author: Maarten Lankhorst 
Date:   Mon Jan 7 14:15:14 2013 +0100

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 5ea835d..ea92c08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+commit 8f934fad5d4934936b3265f272ca81e73c60d7dc
+Author: Dave Airlie 
+Date:   Mon Jan 7 14:13:10 2013 +1000
+
+bump to 1.0.6
+
+Signed-off-by: Dave Airlie 
+
+commit 00834273e22f7234a3755269100ea3f10b521e35
+Author: Dave Airlie 
+Date:   Mon Jan 7 14:04:40 2013 +1000
+
+nouveau: fix dirty redisplay damage handling
+
+This processes the damage in the correct order.
+
+Signed-off-by: Dave Airlie 
+
+commit 389b8a8dd91a48dee524eac96e60813c507f1a82
+Author: Ben Skeggs 
+Date:   Mon Jan 7 14:05:06 2013 +1000

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-10-25 Thread Timo Aaltonen 
 debian/changelog |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit db21b0e4aa6bf3ea6d2925151d835d8c379f8e0e
Author: Timo Aaltonen 
Date:   Thu Oct 25 13:24:26 2012 +0300

release to quantal-proposed

diff --git a/debian/changelog b/debian/changelog
index 0ddf5c8..1a4503a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-xserver-xorg-video-nouveau (1:1.0.3-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.3-0ubuntu0.1) quantal-proposed; urgency=low
 
-  * New upstream release
+  [ Maarten Lankhorst ]
+  * New upstream bugfix release
   * Fix SIBABRT in NVRefreshArea (LP: #1056511)
   * Fix race condition in vblank
   * Add solid fill acceleration (LP: #1010794)
   * Cleanup download/upload screen functions (LP: #1010794)
   * Fix prime rendering with kwin
 
- -- Maarten Lankhorst   Mon, 22 Oct 2012 
12:24:31 +0200
+ -- Timo Aaltonen   Thu, 25 Oct 2012 13:23:57 +0300
 
 xserver-xorg-video-nouveau (1:1.0.3-1) UNRELEASED; urgency=low
 


-- 
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/e1trkfy-0008rw...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-10-25 Thread Maarten Lankhorst 
 ChangeLog |  147 ++
 configure.ac  |2 
 debian/changelog  |   34 +++
 debian/patches/02-clamp-to-edge.patch |   65 ---
 debian/patches/101-bounds.diff|   42 -
 debian/patches/102-vblank-race.diff   |  124 
 debian/patches/103-solidfill.diff |   75 -
 debian/patches/104-fix-access.diff|   79 --
 debian/patches/series |5 -
 src/nouveau_dri2.c|   57 +
 src/nouveau_exa.c |   15 ++-
 src/nv40_exa.c|6 -
 src/nv50_exa.c|6 -
 src/nv_driver.c   |1 
 src/nv_include.h  |3 
 src/nv_shadow.c   |7 -
 src/nv_type.h |2 
 src/nvc0_exa.c|   40 +
 18 files changed, 245 insertions(+), 465 deletions(-)

New commits:
commit 9213c2fdbf789dfcb385f75f1e0ec9f979629ff2
Author: Maarten Lankhorst 
Date:   Thu Oct 25 11:15:12 2012 +0200

New upstream release

* New upstream release
* Fix SIBABRT in NVRefreshArea (LP: #1056511)
* Fix race condition in vblank
* Add solid fill acceleration (LP: #1010794)
* Cleanup download/upload screen functions (LP: #1010794)
* Fix prime rendering with kwin

diff --git a/debian/changelog b/debian/changelog
index a990d82..0ddf5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-nouveau (1:1.0.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Fix SIBABRT in NVRefreshArea (LP: #1056511)
+  * Fix race condition in vblank
+  * Add solid fill acceleration (LP: #1010794)
+  * Cleanup download/upload screen functions (LP: #1010794)
+  * Fix prime rendering with kwin
+
+ -- Maarten Lankhorst   Mon, 22 Oct 2012 
12:24:31 +0200
+
 xserver-xorg-video-nouveau (1:1.0.3-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
@@ -9,20 +20,6 @@ xserver-xorg-video-nouveau (1:1.0.3-1) UNRELEASED; urgency=low
 
  -- Maarten Lankhorst   Mon, 16 Jul 2012 
15:22:19 +0200
 
-xserver-xorg-video-nouveau (1:1.0.2-0ubuntu4) UNRELEASED; urgency=low
-
-  * Add upstream commits fixing some issues
-  * Fix SIBABRT in NVRefreshArea (LP: #1056511)
-- 101-bounds.diff
-  * Fix race condition in vblank
-- 102-vblank.diff
-  * Add solid fill acceleration (LP: #1010794)
-- 103-solidfill.diff
-  * Cleanup download/upload screen functions (LP: #1010794)
-- 104-fix-access.diff
-
- -- Maarten Lankhorst   Mon, 22 Oct 2012 
12:24:31 +0200
-
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu3) quantal; urgency=low
 
   * Add upstream exa rendering fix (FDo: #55310)

commit 919949abbe048323d0951e752bba9937d7f7aac2
Author: Maarten Lankhorst 
Date:   Thu Oct 25 11:09:23 2012 +0200

new upstream release

diff --git a/ChangeLog b/ChangeLog
index be9cb72..0b254e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,150 @@
+commit 8c3e1623b0be15f8cc590d893bfd19be87bd079a
+Author: Maarten Lankhorst 
+Date:   Wed Oct 24 11:19:04 2012 +0200
+
+bump version to 1.0.3
+
+commit 6644a3a724a11150eba0c0082c8d4fe167b1755e
+Author: Maarten Lankhorst 
+Date:   Tue Oct 23 20:17:29 2012 +0200
+
+exa: remove exaMarkSync from download/upload screen
+
+They're noops on nouveau since sync markers are unused and
+download/upload are always synchronous anyway from exa's POV.
+
+Signed-off-by: Maarten Lankhorst 
+
+commit 2a757b7dffa85c30879653a1e52e33b8f4fa8806
+Author: Maarten Lankhorst 
+Date:   Tue Oct 23 17:04:37 2012 +0200
+
+exa: fix comparison in download_from_screen
+
+Presumably a copy/paste error from upload_to_screen.
+
+Signed-off-by: Maarten Lankhorst 
+
+commit 72230cd5a7846f7a26f929262a745dc0bdc34a3d
+Author: Maarten Lankhorst 
+Date:   Tue Oct 23 10:37:27 2012 +0200
+
+exa: fix up download_from/upload_to screen
+
+Add a missing return TRUE to download_from_screen.
+Add a missing exaMarkSync to memcpy in upload_to_screen.
+Add a really loud warning to both if memcpy to/from tiled is done.
+
+Signed-off-by: Maarten Lankhorst 
+
+commit 1d7890ecb8b3188177ab85608ea232812672d923
+Author: Maarten Lankhorst 
+Date:   Tue Oct 23 09:53:39 2012 +0200
+
+remove unused members from nv_type.h
+
+commit 0b2a548316b0ce88ba19d5e05fdca205fc139962
+Author: Maarten Lankhorst 
+Date:   Mon Oct 22 13:12:06 2012 +0200
+
+nvc0/exa: make solid fill actually work
+
+Some investigation showed that the code for accelerating solid fill
+didn't actually work because NVC0EXACheckTexture would fail.
+
+Making the check the same as in NV50EXACheckTexture fixes this, and
+seems to get acceleration for solid fills working right.
+
+Signed-off-by: Maarten Lankhorst 
+
+commit b4231dd715a8a7f86b04519b5f4e8a8d93c2f561
+Aut

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-10-23 Thread Maarten Lankhorst 
 debian/changelog|   14 
 debian/patches/101-bounds.diff  |   42 
 debian/patches/102-vblank-race.diff |  124 
 debian/patches/103-solidfill.diff   |   75 +
 debian/patches/104-fix-access.diff  |   79 ++
 debian/patches/series   |4 +
 6 files changed, 338 insertions(+)

New commits:
commit 1ae6f9c4bc371d8d035febc4b24399dd8a8593be
Author: Maarten Lankhorst 
Date:   Tue Oct 23 20:23:26 2012 +0200

Add upstream commits for cleaning up download/upload screen functions (LP: 
#1010794)

diff --git a/debian/changelog b/debian/changelog
index 102c186..5f94377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xserver-xorg-video-nouveau (1:1.0.2-0ubuntu4) UNRELEASED; 
urgency=low
 - 101-bounds.diff
   * Fix race condition in vblank
 - 102-vblank.diff
-  * Fix corruption in software center (LP: #1010794)
+  * Add solid fill acceleration (LP: #1010794)
 - 103-solidfill.diff
+  * Cleanup download/upload screen functions (LP: #1010794)
+- 104-fix-access.diff
 
  -- Maarten Lankhorst   Mon, 22 Oct 2012 
12:24:31 +0200
 
diff --git a/debian/patches/104-fix-access.diff 
b/debian/patches/104-fix-access.diff
new file mode 100644
index 000..d086882
--- /dev/null
+++ b/debian/patches/104-fix-access.diff
@@ -0,0 +1,79 @@
+diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
+index 13d7e1f..8191aeb 100644
+--- a/src/nouveau_exa.c
 b/src/nouveau_exa.c
+@@ -269,7 +269,7 @@ nouveau_exa_download_from_screen(PixmapPtr pspix, int x, 
int y, int w, int h,
+   goto memcpy;
+ 
+   nouveau_bo_wait(tmp, NOUVEAU_BO_RD, pNv->client);
+-  if (src_pitch == tmp_pitch) {
++  if (dst_pitch == tmp_pitch) {
+   memcpy(dst, tmp->map + tmp_offset, dst_pitch * lines);
+   dst += dst_pitch * lines;
+   } else {
+@@ -285,9 +285,14 @@ nouveau_exa_download_from_screen(PixmapPtr pspix, int x, 
int y, int w, int h,
+   h -= lines;
+   y += lines;
+   }
++  return TRUE;
+ 
+ memcpy:
+   bo = nouveau_pixmap_bo(pspix);
++  if (nv50_style_tiled_pixmap(pspix))
++  ErrorF("%s:%d - falling back to memcpy ignores tiling\n",
++ __func__, __LINE__);
++
+   if (nouveau_bo_map(bo, NOUVEAU_BO_RD, pNv->client))
+   return FALSE;
+   src = (char *)bo->map + (y * src_pitch) + (x * cpp);
+@@ -316,20 +321,17 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int 
y, int w, int h,
+   if (pNv->Architecture < NV_ARCH_50) {
+   if (NV04EXAUploadIFC(pScrn, src, src_pitch, pdpix,
+x, y, w, h, cpp)) {
+-  exaMarkSync(pdpix->drawable.pScreen);
+   return TRUE;
+   }
+   } else
+   if (pNv->Architecture < NV_ARCH_C0) {
+   if (NV50EXAUploadSIFC(src, src_pitch, pdpix,
+ x, y, w, h, cpp)) {
+-  exaMarkSync(pdpix->drawable.pScreen);
+   return TRUE;
+   }
+   } else {
+   if (NVC0EXAUploadSIFC(src, src_pitch, pdpix,
+ x, y, w, h, cpp)) {
+-  exaMarkSync(pdpix->drawable.pScreen);
+   return TRUE;
+   }
+   }
+@@ -367,12 +369,15 @@ nouveau_exa_upload_to_screen(PixmapPtr pdpix, int x, int 
y, int w, int h,
+   y += lines;
+   }
+ 
+-  exaMarkSync(pdpix->drawable.pScreen);
+   return TRUE;
+ 
+   /* fallback to memcpy-based transfer */
+ memcpy:
+   bo = nouveau_pixmap_bo(pdpix);
++  if (nv50_style_tiled_pixmap(pdpix))
++  ErrorF("%s:%d - falling back to memcpy ignores tiling\n",
++ __func__, __LINE__);
++
+   if (nouveau_bo_map(bo, NOUVEAU_BO_WR, pNv->client))
+   return FALSE;
+   dst = (char *)bo->map + (y * dst_pitch) + (x * cpp);
+diff --git a/src/nv_type.h b/src/nv_type.h
+index 5a99dbd..d882e7c 100644
+--- a/src/nv_type.h
 b/src/nv_type.h
+@@ -167,8 +167,6 @@ typedef struct _NVPortPrivRec {
+ 
+ struct nouveau_pixmap {
+   struct nouveau_bo *bo;
+-  void *linear;
+-  unsigned size;
+   Bool shared;
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cfd9165..aeca4e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 101-bounds.diff
 102-vblank-race.diff
 103-solidfill.diff
+104-fix-access.diff

commit 443a9d95db47578bfc26462198a26578a85956fa
Author: Maarten Lankhorst 
Date:   Mon Oct 22 13:39:02 2012 +0200

Add upstream commits fixing some issues

* Add upstream commits

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-10-04 Thread Timo Aaltonen 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3362cb4eaf8567615b40946a6a9bf15ed706b8ae
Author: Timo Aaltonen 
Date:   Thu Oct 4 15:18:43 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 048bfcd..c1fef59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:1.0.2-0ubuntu3) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu3) quantal; urgency=low
 
   * Add upstream exa rendering fix (FDo: #55310)
 - 02-clamp-to-edge.patch


-- 
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/e1tjkpq-0008qc...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-10-04 Thread Maarten Lankhorst 
 debian/changelog  |   10 +
 debian/patches/02-clamp-to-edge.patch |   65 ++
 debian/patches/series |1 
 debian/watch  |2 -
 4 files changed, 76 insertions(+), 2 deletions(-)

New commits:
commit 7557c8469ff09ad64838ad4ad78510064c7e94ec
Author: Maarten Lankhorst 
Date:   Thu Oct 4 14:02:03 2012 +0200

Add upstream exa rendering fix (FDo: #55310)

diff --git a/debian/changelog b/debian/changelog
index 80893a4..048bfcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu3) UNRELEASED; urgency=low
+
+  * Add upstream exa rendering fix (FDo: #55310)
+- 02-clamp-to-edge.patch
+
+ -- Maarten Lankhorst   Thu, 04 Oct 2012 
14:00:08 +0200
+
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) quantal; urgency=low
 
   [ Maarten Lankhorst ]

commit 236873ec98ac15fbc9a99fd9f38e7831a6285868
Author: Maarten Lankhorst 
Date:   Thu Oct 4 13:56:09 2012 +0200

add upstream 02-clamp-to-edge.patch to fix a exa rendering error

diff --git a/debian/changelog b/debian/changelog
index 9aded55..b1de9c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ xserver-xorg-video-nouveau (1:1.0.2-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * watch: Use the .gz tarball, and update the url.
 
+  [ Maarten Lankhorst ]
+  * add upstream 02-clamp-to-edge.patch to fix a exa rendering error
+
  -- Maarten Lankhorst   Mon, 16 Jul 2012 
15:22:19 +0200
 
 xserver-xorg-video-nouveau (1:1.0.1-3) unstable; urgency=low
diff --git a/debian/patches/02-clamp-to-edge.patch 
b/debian/patches/02-clamp-to-edge.patch
new file mode 100644
index 000..cdcf5d5
--- /dev/null
+++ b/debian/patches/02-clamp-to-edge.patch
@@ -0,0 +1,65 @@
+commit 5c9379b14cdabc81fd5d4c916dcd93dc77c4f683
+Author: Sebastian Keller 
+Date:   Tue Sep 25 11:35:35 2012 +0200
+
+exa: use CLAMP_TO_EDGE for RepeatPad
+
+This fixes border rendering in some gtk3 themes.
+https://bugs.freedesktop.org/show_bug.cgi?id=55310
+
+v2 (Ben Skeggs): implement same fix for fermi/kepler too
+
+Signed-off-by: Sebastian Keller 
+Signed-off-by: Ben Skeggs 
+
+diff --git a/src/nv40_exa.c b/src/nv40_exa.c
+index 87ed5b2..c9e99e0 100644
+--- a/src/nv40_exa.c
 b/src/nv40_exa.c
+@@ -260,9 +260,9 @@ NV40EXAPictTexture(NVPtr pNv, PixmapPtr pPix, PicturePtr 
pPict, int unit)
+   if (pPict->repeat) {
+   switch(pPict->repeatType) {
+   case RepeatPad:
+-  PUSH_DATA (push, NV30_3D_TEX_WRAP_S_CLAMP | 
+-   NV30_3D_TEX_WRAP_T_CLAMP |
+-   NV30_3D_TEX_WRAP_R_CLAMP);
++  PUSH_DATA (push, NV30_3D_TEX_WRAP_S_CLAMP_TO_EDGE |
++   NV30_3D_TEX_WRAP_T_CLAMP_TO_EDGE |
++   NV30_3D_TEX_WRAP_R_CLAMP_TO_EDGE);
+   break;
+   case RepeatReflect:
+   PUSH_DATA (push, NV30_3D_TEX_WRAP_S_MIRRORED_REPEAT |
+diff --git a/src/nv50_exa.c b/src/nv50_exa.c
+index d6f38eb..e70d92d 100644
+--- a/src/nv50_exa.c
 b/src/nv50_exa.c
+@@ -665,9 +665,9 @@ NV50EXAPictTexture(NVPtr pNv, PixmapPtr ppix, PicturePtr 
ppict, unsigned unit)
+   if (ppict->repeat) {
+   switch (ppict->repeatType) {
+   case RepeatPad:
+-  PUSH_DATA (push, NV50TSC_1_0_WRAPS_CLAMP |
+-   NV50TSC_1_0_WRAPT_CLAMP |
+-   NV50TSC_1_0_WRAPR_CLAMP | 0x00024000);
++  PUSH_DATA (push, NV50TSC_1_0_WRAPS_CLAMP_TO_EDGE |
++   NV50TSC_1_0_WRAPT_CLAMP_TO_EDGE |
++   NV50TSC_1_0_WRAPR_CLAMP_TO_EDGE | 0x00024000);
+   break;
+   case RepeatReflect:
+   PUSH_DATA (push, NV50TSC_1_0_WRAPS_MIRROR_REPEAT |
+diff --git a/src/nvc0_exa.c b/src/nvc0_exa.c
+index dc8ba0b..7bd7294 100644
+--- a/src/nvc0_exa.c
 b/src/nvc0_exa.c
+@@ -659,9 +659,9 @@ NVC0EXAPictTexture(NVPtr pNv, PixmapPtr ppix, PicturePtr 
ppict, unsigned unit)
+   switch (ppict->repeatType) {
+   case RepeatPad:
+   PUSH_DATA (push, 0x00024000 |
+-   NV50TSC_1_0_WRAPS_CLAMP |
+-   NV50TSC_1_0_WRAPT_CLAMP |
+-   NV50TSC_1_0_WRAPR_CLAMP);
++   NV50TSC_1_0_WRAPS_CLAMP_TO_EDGE |
++   NV50TSC_1_0_WRAPT_CLAMP_TO_EDGE |
++   NV50TSC_1_0_WRAPR_CLAMP_TO_EDGE);
+   break;
+   case RepeatReflect:
+   PUSH_DATA (push, 0x00024000 |
diff --git a/debian/patches/series b/debian/patches/series
index d6892cf..feaa065 1

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-09-26 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3869517ffdb65361f1fc055c80bcb23ed5d7f5d5
Author: Timo Aaltonen 
Date:   Wed Sep 26 14:59:40 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 7895209..7d2f04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) quantal; urgency=low
 
+  [ Maarten Lankhorst ]
   * Try to enable vblank if available (LP: #1019131)
 - 100-vblank-on.diff
 
- -- Maarten Lankhorst   Wed, 26 Sep 2012 
10:20:36 +0200
+ -- Timo Aaltonen   Wed, 26 Sep 2012 14:59:24 +0300
 
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu1) quantal; urgency=low
 


-- 
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/e1tgqis-0005nb...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-09-26 Thread Maarten Lankhorst 
 debian/changelog  |7 +++
 debian/patches/100-vblank-on.diff |   13 +
 debian/patches/series |4 
 3 files changed, 24 insertions(+)

New commits:
commit 382b9a46d8beb6b7832a16d5fc43f7524e9e2603
Author: Maarten Lankhorst 
Date:   Wed Sep 26 10:23:02 2012 +0200

Try to enable vblank if available

  Add 100-vblank-on.diff

diff --git a/debian/changelog b/debian/changelog
index 5f74cc6..7895209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Try to enable vblank if available (LP: #1019131)
+- 100-vblank-on.diff
+
+ -- Maarten Lankhorst   Wed, 26 Sep 2012 
10:20:36 +0200
+
 xserver-xorg-video-nouveau (1:1.0.2-0ubuntu1) quantal; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/100-vblank-on.diff 
b/debian/patches/100-vblank-on.diff
new file mode 100644
index 000..46b18eb
--- /dev/null
+++ b/debian/patches/100-vblank-on.diff
@@ -0,0 +1,13 @@
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 271f641..0b92025 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -932,6 +932,8 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+   if (xf86GetOptValBool(pNv->Options, OPTION_GLX_VBLANK,
+ &pNv->glx_vblank))
+   from = X_CONFIG;
++  else
++  pNv->glx_vblank = TRUE;
+ 
+   xf86DrvMsg(pScrn->scrnIndex, from, "GLX sync to VBlank %s.\n",
+  pNv->glx_vblank ? "enabled" : "disabled");
diff --git a/debian/patches/series b/debian/patches/series
index d6892cf..e8e209c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,5 @@
 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
+
+# Ubuntu patches
+
+100-vblank-on.diff


-- 
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/e1tgpjs-n2...@vasks.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-09-12 Thread Timo Aaltonen 
 ChangeLog |   89 +
 configure.ac  |2 
 debian/NEWS.Debian|7 +-
 debian/changelog  |   20 ++
 debian/watch  |2 
 src/drmmode_display.c |4 +
 src/nouveau_dri2.c|  150 ++
 src/nouveau_exa.c |   45 +++
 src/nouveau_local.h   |1 
 src/nv50_exa.c|3 -
 src/nv_driver.c   |  127 +-
 src/nv_include.h  |6 +-
 src/nv_proto.h|1 
 src/nv_type.h |6 +-
 src/nvc0_accel.c  |   59 ++-
 src/nvc0_accel.h  |1 
 src/nvc0_exa.c|3 -
 src/nvc0_xv.c |4 -
 18 files changed, 471 insertions(+), 59 deletions(-)

New commits:
commit addd541028ee25c9924dcea5278cf6a40317bed7
Author: Timo Aaltonen 
Date:   Wed Sep 12 17:31:35 2012 +0300

watch: update the url

diff --git a/debian/changelog b/debian/changelog
index d71024f..9aded55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xserver-xorg-video-nouveau (1:1.0.2-1) UNRELEASED; urgency=low
   * Drop 02-drm-nouveau-newabi.patch and require libdrm 2.4.34
 
   [ Timo Aaltonen ]
-  * watch: Use the .gz tarball.
+  * watch: Use the .gz tarball, and update the url.
 
  -- Maarten Lankhorst   Mon, 16 Jul 2012 
15:22:19 +0200
 
diff --git a/debian/watch b/debian/watch
index 446e658..d20b1b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 version=3
 # Only a bzip2 tarball is currently available -- you need to
 # use uscan's --repack option
-http://nouveau.freedesktop.org/release/xf86-video-nouveau-(.+)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/driver/ 
xf86-video-nouveau-(.+)\.tar\.gz

commit 6ec63eafd1e007bd792792c8e29c071d6954d32c
Author: Timo Aaltonen 
Date:   Wed Sep 12 17:29:27 2012 +0300

watch: Use the .gz tarball.

diff --git a/debian/changelog b/debian/changelog
index 7e8404c..d71024f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xserver-xorg-video-nouveau (1:1.0.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Drop 02-drm-nouveau-newabi.patch and require libdrm 2.4.34
 
+  [ Timo Aaltonen ]
+  * watch: Use the .gz tarball.
+
  -- Maarten Lankhorst   Mon, 16 Jul 2012 
15:22:19 +0200
 
 xserver-xorg-video-nouveau (1:1.0.1-3) unstable; urgency=low
diff --git a/debian/watch b/debian/watch
index 1dfc1ad..446e658 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 version=3
 # Only a bzip2 tarball is currently available -- you need to
 # use uscan's --repack option
-http://nouveau.freedesktop.org/release/xf86-video-nouveau-(.+)\.tar\.bz2
+http://nouveau.freedesktop.org/release/xf86-video-nouveau-(.+)\.tar\.gz

commit 355e3985f7e4458319eb5d760bd3ce2e8b20c8a5
Author: Timo Aaltonen 
Date:   Wed Sep 12 17:28:10 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 5664773..37e0bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.2-0ubuntu1) quantal; urgency=low
+
+  * Sync from unreleased debian git.
+
+ -- Timo Aaltonen   Wed, 12 Sep 2012 17:26:27 +0300
+
 xserver-xorg-video-nouveau (1:1.0.2-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]

commit 6be7f6c22567141e1b09cefd2740a0cb11228f12
Author: Maarten Lankhorst 
Date:   Wed Sep 12 15:12:15 2012 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 54ad2a3..be9cb72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+commit 20f3830ddf868c0d1a46c18fa381585c076bfb8d
+Author: Maarten Lankhorst 
+Date:   Wed Sep 12 13:42:43 2012 +0200
+
+bump version to 1.0.2
+
+commit 239f39977ebb64c9d545c6f3c905de3c0ad840d0
+Author: Dave Airlie 
+Date:   Thu Jul 19 13:46:44 2012 +1000
+
+nouveau: enable provider/capabilities
+
+this adds the provider object for nouveau and enables the capabilities
+on it.
+
+Signed-off-by: Dave Airlie 
+
+commit 28abba276e36fd0176f416996d44297ddf13f5cd
+Author: Dave Airlie 
+Date:   Thu Jul 19 13:46:12 2012 +1000
+
+nouveau/dri2: add support for DRI2 offload
+
+This adds the nouveau interfaces for DRI2 offload, this allows nouveau
+to act as an offload slave.
+
+Signed-off-by: Dave Airlie 
+
+commit b0be0ac86bae871c9f1724c40298d50d7f2b08e4
+Author: Dave Airlie 
+Date:   Thu Jul 19 13:45:32 2012 +1000
+
+nouveau: add pixmap tracking/updating support.
+
+This should allow nouveau to act as an output master for driving output
+slaves.
+
+Signed-off-by: Dave Airlie 
+
+commit baf485b1d304d741073f058d524ca698af3c15cd
+Author: Dave Airlie 
+Date:   Thu Jul 19 13:42:13 2012 +1000
+
+nouveau/exa: add support for shared pixmaps.
+
+This adds the pixmap export/import hooks, along with code for nv50/nvc0
+to validate shared buffers in GTT space.
+
+Signed-off-by: Dave Airlie 
+
+commit 2f48b8f462a03cb92db9e9a7ae1957eb27473965
+Autho

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2012-07-18 Thread Maarten Lankhorst 
 ChangeLog | 1170 +-
 configure.ac  |   17 
 debian/NEWS.Debian|   16 
 debian/README.Debian  |   63 
 debian/README.source  |   44 
 debian/changelog  |  129 
 debian/clean  |   20 
 debian/compat |2 
 debian/control|   26 
 debian/copyright  |   18 
 debian/patches/02_nouveau_bgnr|   34 
 debian/patches/03_use_older_libdrm_headers.diff   |  205 
 debian/patches/03_work-around-exa-hangs.patch |   33 
 debian/patches/04_emit_surface_state_after_flush.diff |   21 
 debian/patches/05_dri2_buffer_failure_path_crash.diff |   36 
 debian/patches/series |4 
 debian/rules  |  101 
 debian/watch  |4 
 debian/xorg.conf  |6 
 debian/xserver-xorg-video-nouveau.examples|1 
 debian/xsfbs/repack.sh|   32 
 debian/xsfbs/xsfbs.mk |  285 
 debian/xsfbs/xsfbs.sh |  622 -
 man/nouveau.man   |   18 
 src/Makefile.am   |   48 
 src/compat-api.h  |   96 
 src/drmmode_display.c |  170 
 src/hwdefs/nv01_2d.xml.h  | 1416 ++
 src/hwdefs/nv10_3d.xml.h  | 1637 ++
 src/hwdefs/nv30-40_3d.xml.h   | 2052 +++
 src/hwdefs/nv50_2d.xml.h  |  434 
 src/hwdefs/nv50_3d.xml.h  | 2127 +++
 src/hwdefs/nv50_defs.xml.h|  155 
 src/hwdefs/nv50_texture.h |  166 
 src/hwdefs/nv_3ddefs.xml.h|   93 
 src/hwdefs/nv_m2mf.xml.h  |  174 
 src/hwdefs/nv_object.xml.h|  301 
 src/hwdefs/nvc0_3d.xml.h  | 1867 +++
 src/hwdefs/nvc0_m2mf.xml.h|  178 
 src/nouveau_class.h   |10049 --
 src/nouveau_dri2.c|  339 
 src/nouveau_exa.c |  440 
 src/nouveau_local.h   |  175 
 src/nouveau_wfb.c |5 
 src/nouveau_xv.c  |  224 
 src/nv04_accel.h  |   93 
 src/nv04_exa.c|  534 
 src/nv04_xv_blit.c|  272 
 src/nv10_exa.c|  887 -
 src/nv30_exa.c| 1067 -
 src/nv30_shaders.c|  350 
 src/nv30_shaders.h|   72 
 src/nv30_xv_tex.c |  351 
 src/nv40_exa.c| 1065 +
 src/nv40_xv_tex.c |  336 
 src/nv50_accel.c  |  710 -
 src/nv50_accel.h  |   81 
 src/nv50_exa.c|  973 -
 src/nv50_texture.h|  166 
 src/nv50_xv.c |  392 
 src/nv_accel_common.c |  653 -
 src/nv_const.h|6 
 src/nv_dma.c  |  119 
 src/nv_dma.h  |4 
 src/nv_driver.c   |  212 
 src/nv_include.h  |   17 
 src/nv_proto.h|   67 
 src/nv_shadow.c   |3 
 src/nv_type.h |   70 
 src/nvc0_accel.c  |  283 
 src/nvc0_accel.h  |  109 
 src/nvc0_exa.c| 1133 ++
 src/nvc0_shader.h |  444 
 src/nvc0_xv.c |  296 
 src/nve0_shader.h |  440 
 src/vl_hwmc.c |   43 
 76 files changed, 19898 insertions(+), 16403 deletions(-)

New commits:
commit 63ebddd8af502533cab826a2599f9d903ff1bddf
Author: Maarten Lankhorst 
Date:   Wed Jul 18 10

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-04-10 Thread Christopher Halse Rogers 
 debian/changelog  |   12 ++
 debian/patches/04_emit_surface_state_after_flush.diff |   21 ++
 debian/patches/05_dri2_buffer_failure_path_crash.diff |   36 ++
 debian/patches/series |2 +
 4 files changed, 71 insertions(+)

New commits:
commit ed6e411812966eb297ab11d3cf18e9f353e91f16
Author: Christopher James Halse Rogers 
Date:   Mon Apr 11 16:04:43 2011 +1000

Release to natty

diff --git a/debian/changelog b/debian/changelog
index eb44356..b55e72d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu7) 
UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu7) natty; 
urgency=low
 
   * debian/patches/04_emit_surface_state_after_flush.diff:
 + Cherry-pick from upstream.  Re-emit surface state after flush, or

commit aac46ec9f6fedb7141196d7391f62427a6153aaa
Author: Christopher James Halse Rogers 
Date:   Mon Apr 11 16:00:26 2011 +1000

Revert "Build-depend on libdrm 2.4.24 for the new nouveau headers"

We haven't picked up libdrm 2.4.24, so don't B/D on it.

This reverts commit 13ca30fa7ece11d56fb934a7e4eecaf25797555a.

diff --git a/debian/changelog b/debian/changelog
index 1a6d43f..eb44356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu7) UNRELEASED;
 + Cherry-pick from upstream.  Re-emit surface state after flush, or
   PGRAPH_TRAP_CCACHE_FAULTs will ruin your day and cause [mi] EQ overflow
   to eat your X.
-  * debian/control:
-+ Build-depend on libdrm 2.4.24 for moved nouveau headers
   * debian/patches/05_dri2_buffer_failure_path_crash.diff:
 + Cherry-pick from upstream.  Return an error rather than crash the X
   server when failing to create a dri2 buffer.
diff --git a/debian/control b/debian/control
index 9ceb4d3..3d87155 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
  x11proto-xext-dev,
- libdrm-dev (>= 2.4.24),
+ libdrm-dev (>= 2.4.23),
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  mesa-common-dev,

commit c571c2d475191bf7e886d526e1e262d003b829ef
Author: Christopher James Halse Rogers 
Date:   Mon Apr 11 16:00:19 2011 +1000

Revert 17775081:
Drop patch to use older libdrm headers now 2.4.24 is available

We're not picking up libdrm 2.4.24, this patch is still needed.

diff --git a/debian/changelog b/debian/changelog
index d04f670..1a6d43f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu7) UNRELEASED;
 + Cherry-pick from upstream.  Re-emit surface state after flush, or
   PGRAPH_TRAP_CCACHE_FAULTs will ruin your day and cause [mi] EQ overflow
   to eat your X.
-  * debian/patches/03_use_older_libdrm_headers.diff:
-+ Drop now that libdrm 2.4.24 is available.
   * debian/control:
 + Build-depend on libdrm 2.4.24 for moved nouveau headers
   * debian/patches/05_dri2_buffer_failure_path_crash.diff:
diff --git a/debian/patches/03_use_older_libdrm_headers.diff 
b/debian/patches/03_use_older_libdrm_headers.diff
new file mode 100644
index 000..4e4356b
--- /dev/null
+++ b/debian/patches/03_use_older_libdrm_headers.diff
@@ -0,0 +1,205 @@
+commit c2092a458401377f421d9bdfe1d97ce580b99508
+Author: Ben Skeggs 
+Date:   Mon Dec 20 11:50:57 2010 +1000
+
+include nv04_pushbuf.h for ring macros, rather than nouveau_pushbuf.h
+
+Signed-off-by: Ben Skeggs 
+
+diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
+index 2dd6da4..45add0f 100644
+--- a/src/nouveau_dri2.c
 b/src/nouveau_dri2.c
+@@ -5,6 +5,7 @@
+ 
+ #include "xorg-server.h"
+ #include "nv_include.h"
++#include "nouveau_pushbuf.h"
+ #ifdef DRI2
+ #include "dri2.h"
+ #endif
+diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
+index 4618994..4e9f946 100644
+--- a/src/nouveau_exa.c
 b/src/nouveau_exa.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "nv_include.h"
++#include "nv04_pushbuf.h"
+ #include "exa.h"
+ 
+ static inline Bool
+diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
+index dba153c..c1d4ccb 100644
+--- a/src/nouveau_xv.c
 b/src/nouveau_xv.c
+@@ -35,6 +35,8 @@
+ #include "nv_include.h"
+ #include "nv_dma.h"
+ 
++#include "nv04_pushbuf.h"
++
+ #include "vl_hwmc.h"
+ 
+ #define IMAGE_MAX_W 2046
+diff --git a/src/nv04_exa.c b/src/nv04_exa.c
+index 2760d4b..f2819d2 100644
+--- a/src/nv04_exa.c
 b/src/nv04_exa.c
+@@ -23,6 +23,8 @@
+ #include "nv_include.h"
+ #include "nv_rop.h"
+ 
++#include "nv04_pushbuf.h"
++
+ static void 
+ NV04EXASetPattern(ScrnInfoPtr pScrn, CARD32 clr0, CARD32 clr1,
+ CARD32 pat0, CARD32 pat1)
+diff --git a/src/nv04_xv_blit.c b/src/nv04_xv_blit.c
+index be39c0d..1b8de4f 100644
+--- a/src/nv04_xv_blit.c
 b/src/nv04_xv_blit.c

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-03-18 Thread Christopher Halse Rogers 
 debian/changelog |   12 
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 6124cecd34a3550b1e8cbb3862748db9d271b0cd
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 19:47:09 2011 +1100

Rebuild against final 1.10 ABI

diff --git a/debian/changelog b/debian/changelog
index 2888436..e9afbd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu6) natty; 
urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers   Wed, 09 Mar 2011 
14:50:26 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu5) natty; 
urgency=low
 
   * Rebuild to pick up new Xserver dependencies
diff --git a/debian/control b/debian/control
index 9e08426..3d87155 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Chris Lamb , Matthew Johnson 
,
 Build-Depends:
  debhelper (>= 7),
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1~),
+ xserver-xorg-dev (>= 2:1.9.99.903-2ubuntu1~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit eb35b6146075fbe2719fc7ed5eea8852655bb265
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 19:39:55 2011 +1100

Merge in 0ubuntu5 upload

diff --git a/debian/changelog b/debian/changelog
index 5e579fd..2888436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu5) natty; 
urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers   Wed, 23 Feb 2011 
17:53:50 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu4) natty; 
urgency=low
 
   * debian/control: Bump build-depends on xserver-xorg-dev to really,
diff --git a/debian/control b/debian/control
index 50ff4c4..9e08426 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Chris Lamb , Matthew Johnson 
,
 Build-Depends:
  debhelper (>= 7),
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,


-- 
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/e1q0vlb-pw...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-02-01 Thread Christopher Halse Rogers 
 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 20a1b0cda00764fba9336a31929a3c86e04cbd3e
Author: Christopher James Halse Rogers 
Date:   Tue Feb 1 22:02:35 2011 +1100

Really really build against Xserver 1.10

diff --git a/debian/changelog b/debian/changelog
index df810f4..5e579fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu4) natty; 
urgency=low
+
+  * debian/control: Bump build-depends on xserver-xorg-dev to really,
+really build against Xserver 1.10
+
+ -- Christopher James Halse Rogers   Tue, 01 Feb 2011 
22:02:01 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu3) natty; 
urgency=low
 
   * Rebuild against Xserver 1.10
diff --git a/debian/control b/debian/control
index a0db9f7..50ff4c4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Chris Lamb , Matthew Johnson 
,
 Build-Depends:
  debhelper (>= 7),
  pkg-config,
- xserver-xorg-dev (>= 2:1.8),
+ xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,


-- 
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/e1pke0x-00078x...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-01-31 Thread Christopher Halse Rogers 
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit bcbac7e5bb80e7a8d36def9ab4ab8ae384a40f71
Author: Christopher James Halse Rogers 
Date:   Tue Feb 1 16:07:49 2011 +1100

Rebuild against Xserver 1.10

diff --git a/debian/changelog b/debian/changelog
index 39890a0..df810f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu3) natty; 
urgency=low
+
+  * Rebuild against Xserver 1.10
+
+ -- Bryce Harrington   Mon, 31 Jan 2011 18:52:13 -0800
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu2) natty; 
urgency=low
 
   * debian/patches/02_nouveau_bgnr: Fix Xserver 1.10 codepath to not crash the


-- 
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/e1pk8tg-0002xt...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-01-31 Thread Christopher Halse Rogers 
 debian/changelog   |7 +++
 debian/patches/02_nouveau_bgnr |   21 +++--
 2 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit ead27d8828f98ed7a4637cff74025b9d4bea2445
Author: Christopher James Halse Rogers 
Date:   Mon Jan 31 18:51:22 2011 +1100

Fix Plymouth integration patch to not SIGSEGV the server.

Again, builds ≠ works. :(

diff --git a/debian/changelog b/debian/changelog
index 3401027..39890a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu2) natty; 
urgency=low
+
+  * debian/patches/02_nouveau_bgnr: Fix Xserver 1.10 codepath to not crash the
+server.
+
+ -- Christopher James Halse Rogers   Mon, 31 Jan 2011 
18:48:03 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; 
urgency=low
 
   * Merge from Debian experimental.  Remaining Ubuntu changes:
diff --git a/debian/patches/02_nouveau_bgnr b/debian/patches/02_nouveau_bgnr
index 5951841..25a83eb 100644
--- a/debian/patches/02_nouveau_bgnr
+++ b/debian/patches/02_nouveau_bgnr
@@ -9,17 +9,26 @@ Subject: [PATCH 2/2] set canDoBGNoneRoot
 
 Index: xserver-xorg-video-nouveau/src/nv_driver.c
 ===
 xserver-xorg-video-nouveau.orig/src/nv_driver.c2011-01-26 
13:23:04.621550002 +1100
-+++ xserver-xorg-video-nouveau/src/nv_driver.c 2011-01-26 13:28:28.711550002 
+1100
-@@ -690,6 +690,11 @@
+--- xserver-xorg-video-nouveau.orig/src/nv_driver.c2011-01-31 
18:37:19.986515660 +1100
 xserver-xorg-video-nouveau/src/nv_driver.c 2011-01-31 18:43:01.277016240 
+1100
+@@ -690,6 +690,9 @@
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
  
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
-+  pScrn->pScreen->canDoBGNoneRoot = 1;
-+#else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 9
 +  pScrn->canDoBGNoneRoot = 1;
 +#endif
/*
 * The first thing we should figure out is the depth, bpp, etc.
 */
+@@ -1024,6 +1027,10 @@
+   }
+   }
+ 
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
++  pScreen->canDoBGNoneRoot = TRUE;
++#endif
++
+   if (!pNv->NoAccel)
+   nouveau_dri2_init(pScreen);
+ 


-- 
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/e1pjrsn-5j...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2011-01-26 Thread Christopher Halse Rogers 
 ChangeLog   |  459 
 configure.ac|2 
 debian/README.Debian|   21 -
 debian/README.source|   20 +
 debian/changelog|   61 +++
 debian/control  |   12 
 debian/patches/02_nouveau_bgnr  |   21 -
 debian/patches/03_use_older_libdrm_headers.diff |  205 ++
 debian/patches/series   |2 
 debian/watch|2 
 man/nouveau.man |   18 
 src/drmmode_display.c   |  305 +++
 src/nouveau_class.h |2 
 src/nouveau_dri2.c  |  299 +++
 src/nouveau_exa.c   |   92 +---
 src/nouveau_local.h |   11 
 src/nouveau_wfb.c   |2 
 src/nouveau_xv.c|   53 +-
 src/nv04_exa.c  |   39 +-
 src/nv04_xv_blit.c  |   13 
 src/nv10_exa.c  |1 
 src/nv30_exa.c  |1 
 src/nv30_shaders.c  |1 
 src/nv30_xv_tex.c   |   20 -
 src/nv40_exa.c  |1 
 src/nv40_xv_tex.c   |   20 -
 src/nv50_accel.c|   74 ++-
 src/nv50_accel.h|   12 
 src/nv50_exa.c  |1 
 src/nv50_xv.c   |  188 -
 src/nv_accel_common.c   |  109 +
 src/nv_const.h  |8 
 src/nv_dma.c|   24 -
 src/nv_driver.c |  118 --
 src/nv_include.h|4 
 src/nv_proto.h  |   17 
 src/nv_type.h   |9 
 37 files changed, 1853 insertions(+), 394 deletions(-)

New commits:
commit a1e2fdcf0ff00e846b394c40d09319c54182fc12
Author: Christopher James Halse Rogers 
Date:   Thu Jan 27 09:00:16 2011 +1100

Document how to update to a new snapshot

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..ed40ebd 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,6 +14,26 @@ Quick Guide To Patching This Package For The Impatient
 Alternatively, instead of using quilt directly, you can drop the patch in to 
 debian/patches and add the name of the patch to debian/patches/series.
 
+-
+Updating this package
+-
+
+Because nouveau has no releases, packaging a new upstream version has a
+slightly different process to normal.  As there is no canonical tarball,
+we need to generate one ourselves in such a way that it can be regenerated
+properly.  To do this, we use the pristine-tar functionality of 
git-buildpackage
+
+The outline of an update is:
+
+ * Merge upstream into upstream-ubuntu
+ * Create a source tarball, including the git log as $(TOP)/ChangeLog
+ * Import this tarball with git-import-orig
+ * Update debian/changelog
+
+The easiest way to create a new source tarball is to run the get-orig-source
+target of debian/rules, which will create a tarball of upstream/master.
+git-buildpackage is set up to do the right thing when git-import-orig is 
called.
+
 
 Guide To The X Strike Force Packages
 
diff --git a/debian/changelog b/debian/changelog
index c10af58..3401027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; urgen
   * debian/patches/02_nouveau_bgnr:
 - Update to build against both Ubuntu-patched and upstream 1.10 BG None
   ABIs.
+  * debian/README.source:
+- Document how to update to a new upstream snapshot.
 
  -- Christopher James Halse Rogers   Wed, 26 Jan 2011 
13:48:15 +1100
 

commit b17844a66a54d456633aa10c16b60969fe357385
Author: Christopher James Halse Rogers 
Date:   Wed Jan 26 13:49:41 2011 +1100

Refresh patches for new Xserver ABI, build against released libdrm

diff --git a/debian/changelog b/debian/changelog
index 5a3c3a8..c10af58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,14 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20110107+b795ca6e-0ubuntu1) natty; urgen
   * Drop debian/patches/03_work-around-exa-hangs.patch; natty's 2.6.37 kernel
 now has the accompanying kernel commit.
   * New upstream snapshot
-
- -- Christopher James Halse Rogers   Wed, 26 Jan 2011 
13:05:54 +1100
+  * debian/patches/03_use_older_libdrm_headers.diff:
+- Rever

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-08-09 Thread Christopher Halse Rogers 
 ChangeLog |   76 +
 debian/changelog  |   11 
 debian/patches/03_work-around-exa-hangs.patch |   33 
 debian/patches/series |1 
 src/drmmode_display.c |   20 
 src/nouveau_class.h   | 1169 --
 src/nouveau_dri2.c|   12 
 src/nouveau_exa.c |   10 
 src/nouveau_xv.c  |   18 
 src/nv04_exa.c|4 
 src/nv30_exa.c|2 
 src/nv40_exa.c|2 
 src/nv50_accel.c  |8 
 src/nv50_exa.c|   22 
 src/nv_driver.c   |   34 
 15 files changed, 1268 insertions(+), 154 deletions(-)

New commits:
commit 9627898efd2aa4d17f9fa99637b76b0fc96b8779
Author: Christopher James Halse Rogers 
Date:   Mon Aug 9 18:20:47 2010 +1000

Add changelog entry for new snapshot

diff --git a/debian/changelog b/debian/changelog
index 743eba9..1629c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20100805+b96170a-0ubuntu1) maverick; 
urgency=low
+
+  * New upstream snapshot
+- Fixes segfault in DRI2 on Xserver 1.9
+- Fixes assert on Xserver 1.9 startup due to uninitialised scratch pixmaps
+  * debian/patches/03_work-around-exa-hangs.patch:
+- Revert a commit which removes a work-around for EXA hangs; we do not yet
+  have the associated kernel commit in our tree.
+
+ -- Christopher James Halse Rogers   Thu, 05 Aug 2010 
15:02:37 +1000
+
 xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-0ubuntu1) maverick; 
urgency=low
 
   [Christopher James Halse Rogers]
diff --git a/debian/patches/series b/debian/patches/series
index 57f5d9d..b5e3c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-set-NV_DRIVER_DATE-from-ChangeLog.diff
 02_nouveau_bgnr
+03_work-around-exa-hangs.patch

commit 6fad7e0143d558349a6bbaee17000816f28bb03c
Author: Christopher James Halse Rogers 
Date:   Thu Aug 5 17:10:48 2010 +1000

New upstream version

diff --git a/debian/patches/03_work-around-exa-hangs.patch 
b/debian/patches/03_work-around-exa-hangs.patch
new file mode 100644
index 000..0c5e7fd
--- /dev/null
+++ b/debian/patches/03_work-around-exa-hangs.patch
@@ -0,0 +1,33 @@
+Description: Re-add exa hang workaround.
+ .
+ This reverts commit 321eb2df5c8b1da4d6469037dd1db508fabd:
+ .
+Revert "nv04-nv40/exa: Match the blob behavior more closely on 
PrepareCopy."
+ .
+This reverts commit 9de0d97bd2fc2ee8800d48b5340a3d495525ad3e. Unnecessary
+after kernel commit "drm/nouveau: Ack the context switch interrupt before
+switching contexts.".
+ .
+ We do not yet have the named commit in our kernel tree.
+
+
+Index: xserver-xorg-video-nouveau/src/nv04_exa.c
+===
+--- xserver-xorg-video-nouveau.orig/src/nv04_exa.c 2010-08-05 
15:03:35.247880586 +1000
 xserver-xorg-video-nouveau/src/nv04_exa.c  2010-08-05 15:04:17.969451030 
+1000
+@@ -207,11 +207,15 @@
+   return FALSE;
+   }
+ 
++  BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1);
++  OUT_RING  (chan, pNv->NvContextSurfaces->handle);
+   BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1);
+   OUT_RING  (chan, 1); /* ROP_AND */
+ 
+   NV04EXASetROP(pScrn, alu, planemask);
+   } else {
++  BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1);
++  OUT_RING  (chan, pNv->NvContextSurfaces->handle);
+   BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1);
+   OUT_RING  (chan, 3); /* SRCCOPY */
+   }

commit bfa59b85536af6645f72f125d2bcb747dcadad29
Author: Christopher James Halse Rogers 
Date:   Thu Aug 5 14:57:24 2010 +1000

Imported Upstream version 0.0.16+git20100805+b96170a

diff --git a/ChangeLog b/ChangeLog
index 71b05d6..36a2200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+commit b96170a4e51c1d3167601210ca31e98283c02885
+Author: Francisco Jerez 
+Date:   Thu Aug 5 00:40:40 2010 +0200
+
+nv10/exa: Bump maxX/maxY to 4096/4096.
+
+This way we can do accelerated 2D on larger pixmaps, it will still
+fall back to software when we hit the 2048x2048 texturing limit in a
+composite operation.
+
+commit 321eb2df5c8b1da4d6469037dd1db508fabd
+Author: Francisco Jerez 
+Date:   Wed Aug 4 13:11:24 2010 +0200
+
+Revert "nv04-nv40/exa: Match the blob behavior more closely on 
PrepareCopy."
+
+This reverts commit 9de0d97bd2fc2ee8800d48b5340a3d495525ad3e. Unnecessary
+after kernel commit "drm/nouveau: Ack the context switch interrupt before
+switching contexts.".
+
+commit db98ad23633958e52f84501c

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-06-07 Thread Christopher Halse Rogers 
 debian/NEWS.Debian |7 +++
 debian/README.Debian   |   11 +--
 debian/changelog   |   10 ++
 debian/control |6 --
 debian/xserver-xorg-video-nouveau.docs |2 ++
 5 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 86d288bddd44bb9084b4286f4015bff6ad7c4a74
Author: Christopher James Halse Rogers 
Date:   Tue Jun 8 10:08:12 2010 +1000

Close some bugs from the changelog

diff --git a/debian/changelog b/debian/changelog
index f554f63..743eba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20100518+4b8f1a0-0ubuntu1) maverick; urg
   + Patch from Fedora for a smooth Plymouth->GDM transition.
   * New upstream snapshot.  
 - Support for monitor hotplug detection added.
+- Handle starting X with no monitors detected more gracefully (LP: #568079)
+  * Package now built against 0.0.16 ABI (LP: #590989)
   * debian/rules:
 - get-orig-source: Upstream version is now 0.0.16
   * debian/control:

commit 954194f73593137dde16dc6b81b8e1e69432523e
Author: Julien Cristau 
Date:   Wed May 26 13:29:09 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f02e11d..aceb0bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) UNRELEASED; 
urgency=low
+xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) experimental; 
urgency=low
 
+  [ Sven Joachim ]
   * New upstream snapshot, with uevent support.
 - Add build-dependency on libudev-dev.
   * Build against updated librm, kernel 2.6.34 is now required.
@@ -7,7 +8,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) 
UNRELEASED; urgency=
   * Add a NEWS.Debian for that problem and update README.Debian.
   * Add myself to Uploaders.
   
- -- Sven Joachim   Sat, 22 May 2010 10:08:55 +0200
+ -- Julien Cristau   Wed, 26 May 2010 13:28:28 +0200
 
 xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-4) unstable; 
urgency=medium
 

commit 43bb41998ce428613d56a045c315bd6103d26fb8
Author: Sven Joachim 
Date:   Wed May 26 06:57:25 2010 +0200

Add myself to Uploaders

diff --git a/debian/changelog b/debian/changelog
index 5726491..f02e11d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) 
UNRELEASED; urgency=
   * Build against updated librm, kernel 2.6.34 is now required.
 - Bump build-dependency on libdrm-dev to (>= 2.4.20-3~).
   * Add a NEWS.Debian for that problem and update README.Debian.
+  * Add myself to Uploaders.
   
  -- Sven Joachim   Sat, 22 May 2010 10:08:55 +0200
 
diff --git a/debian/control b/debian/control
index 9b1c14c..c89be29 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: xserver-xorg-video-nouveau
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: Chris Lamb , Matthew Johnson , 
Cyril Brulebois 
+Uploaders: Chris Lamb , Matthew Johnson ,
+ Cyril Brulebois , Sven Joachim 
 Build-Depends:
  debhelper (>= 7),
  pkg-config,

commit 32959c388149a5b7cf60e8f5f70f6c8a71e7d0fd
Author: Sven Joachim 
Date:   Sat May 22 14:38:52 2010 +0200

Require libdrm-dev 2.4.20-3~ for build

This ensures that the package is actually built for the the 2.6.34
ABI.

diff --git a/debian/changelog b/debian/changelog
index 8925f4a..5726491 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) 
UNRELEASED; urgency=
   * New upstream snapshot, with uevent support.
 - Add build-dependency on libudev-dev.
   * Build against updated librm, kernel 2.6.34 is now required.
+- Bump build-dependency on libdrm-dev to (>= 2.4.20-3~).
   * Add a NEWS.Debian for that problem and update README.Debian.
   
  -- Sven Joachim   Sat, 22 May 2010 10:08:55 +0200
diff --git a/debian/control b/debian/control
index bdd93d8..9b1c14c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
  x11proto-xext-dev,
- libdrm-dev (>= 2.4.18-4~),
+ libdrm-dev (>= 2.4.20-3~),
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  mesa-common-dev,

commit 09652f0dbfcf3fb5ffe2f7ccfc6da4c33f9084c9
Author: Sven Joachim 
Date:   Sat May 22 10:27:05 2010 +0200

Add a NEWS.Debian file stating that kernel 2.6.34 is required

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 000..5df80f4
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,7 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) experimental; 
urgency=low
+  
+  * This version of xserver-xorg-video-nouveau is linked against a newer
+libdrm-nouveau which breaks the ABI and is not compatible with kernels
+<= 2.6.33.  You need to upgrade the kernel to 2.6.34-r

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-05-18 Thread Christopher Halse Rogers 
 debian/changelog |2 ++
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5e4f85a07eb411176aad633edd93d90dc87057ce
Author: Christopher James Halse Rogers 
Date:   Tue May 18 19:55:50 2010 +1000

Set Ubuntu X Swat as maintainer, not MOTU

diff --git a/debian/changelog b/debian/changelog
index 3ff4ce9..1e2c2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-video-nouveau 
(1:0.0.16+git20100518+4b8f1a0-0ubuntu1) maverick; urg
 - Support for monitor hotplug detection added.
   * debian/rules:
 - get-orig-source: Upstream version is now 0.0.16
+  * debian/control:
+- Ubuntu X Swat is maintainer, not MOTU.
 
  -- Christopher James Halse Rogers   Tue, 18 May 2010 
18:32:50 +1000
 
diff --git a/debian/control b/debian/control
index 45a0c6b..d0a8512 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: xserver-xorg-video-nouveau
 Section: x11
 Priority: optional
-Maintainer: Ubuntu MOTU Developers 
+Maintainer: Ubuntu X-SWAT 
 XSBC-Original-Maintainer: Debian X Strike Force 
 Uploaders: Chris Lamb , Matthew Johnson , 
Cyril Brulebois 
 Build-Depends:


-- 
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/e1oejwr-0007gs...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-03-09 Thread Christopher Halse Rogers 
 debian/changelog   |   22 ++
 debian/control |8 +++-
 debian/dirs|1 -
 debian/nouveau_kms |   18 --
 debian/postinst|7 ---
 debian/postrm  |5 -
 debian/rules   |1 -
 7 files changed, 25 insertions(+), 37 deletions(-)

New commits:
commit e8b96fe0d9d361dc1b05bd108a61439d111d4c64
Author: Christopher James Halse Rogers 
Date:   Wed Mar 10 08:56:01 2010 +1100

Drop lbm dependency, and remove initramfs hook.
Also clean up useless nvidia-glx conflicts/replaces

diff --git a/debian/changelog b/debian/changelog
index 209db1b..47bb279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu4) lucid; 
urgency=low
+
+  * debian/control:
++ Drop dependency on linux-backports-modules-nouveau-lucid-FLAVOUR.  As of
+  2.6.32-16 nouveau is in the main kernel image.  Fixes unsatisfiable 
+  depends (LP: #534978) and prevents the alternate-installer being
+  confused (LP: #526422).
++ Drop ancient, unnecessary conflicts/replaces on non-existent nvidia-glx
+  virtual package.
+  * debian/nouveau_kms:
+  * debian/rules:
++ Drop nouveau_kms initramfs-tools hook.  Now that nouveau is in the main
+  kernel image the existing framebuffer hook correctly copies nouveau into
+  the initramfs.
+  * debian/dirs:
++ Drop, no longer need initramfs-tools hook directory
+  * debian/postinst:
+  * debian/postrm:
++ Drop; update-initramfs trigger is no longer necessary.
+  
+ -- Christopher James Halse Rogers   Wed, 10 Mar 2010 
08:51:31 +1100
+
 xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu3) lucid; 
urgency=low
 
   * debian/patches/02_nouveau_bgnr
diff --git a/debian/control b/debian/control
index 0895c94..8b921dc 100644
--- a/debian/control
+++ b/debian/control
@@ -29,12 +29,10 @@ Vcs-Browser: 
http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau.
 Package: xserver-xorg-video-nouveau
 Architecture: any
 Depends: ${shlibs:Depends}, 
- ${misc:Depends}, 
- ${xserver:Depends}, 
- linux-backports-modules-nouveau-lucid-generic | 
linux-backports-modules-nouveau-lucid-generic-pae
+ ${misc:Depends},
+ ${xserver:Depends}
 Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx
-Conflicts: nvidia-glx
+Replaces: xserver-xorg (<< 6.8.2-35)
 Description: X.Org X server -- Nouveau display driver (experimental)
  This driver for the X.Org X server (see xserver-xorg for a further 
description)
  provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 52c8c74..000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/initramfs-tools/hooks
diff --git a/debian/nouveau_kms b/debian/nouveau_kms
deleted file mode 100755
index fa4eaaf..000
--- a/debian/nouveau_kms
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-PREREQ=""
-prereqs()
-{
-echo "$PREREQ"
-}
-
-case $1 in
-prereqs)
-prereqs
-exit 0
-;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-# Begin real processing below this line
-
-manual_add_modules lbm_nouveau
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 0b6bad7..000
--- a/debian/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ] ; then
-dpkg-trigger update-initramfs
-fi
-
-#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index f39a6f2..000
--- a/debian/postrm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-dpkg-trigger update-initramfs
-
-#DEBHELPER#
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a3e032e..8b61d76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,6 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs
dh_install --sourcedir=debian/tmp --list-missing
-   install -m755 debian/nouveau_kms 
debian/xserver-xorg-video-nouveau/usr/share/initramfs-tools/hooks
dh_link
dh_strip
dh_compress


-- 
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/e1np8wq-00025p...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-28 Thread Christopher Halse Rogers 
 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 549eb772b58508539064fc7b38e6ce7f67c8153d
Author: Christopher James Halse Rogers 
Date:   Mon Mar 1 11:33:45 2010 +1100

Close launchpad tracking bug in changelog

diff --git a/debian/changelog b/debian/changelog
index 2466298..209db1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-nouveau 
(1:0.0.15+git20100219+9b4118d-0ubuntu3) lucid; urgenc
 
   * debian/patches/02_nouveau_bgnr
 + Add patch from Fedora package enabling smooth Plymouth->GDM transition.
+  (LP: #529751)
 
  -- Christopher James Halse Rogers   Fri, 26 Feb 2010 
15:49:20 +1100
 


-- 
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/e1nltaf-ac...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-28 Thread Christopher Halse Rogers 
 .gitignore   |1 +
 debian/changelog |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ed2e97f8217e20761d5124099868afdbbabd46a0
Author: Christopher James Halse Rogers 
Date:   Mon Mar 1 10:47:00 2010 +1100

Finilise changelog

diff --git a/debian/changelog b/debian/changelog
index 0419b68..2466298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu3) UNRELEASED; 
urgency=low
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu3) lucid; 
urgency=low
 
   * debian/patches/02_nouveau_bgnr
 + Add patch from Fedora package enabling smooth Plymouth->GDM transition.

commit da0a6fae626d85c2d10cbbcab92854a334096cab
Author: Christopher James Halse Rogers 
Date:   Mon Mar 1 10:41:49 2010 +1100

Add .pc to gitignore to make git-buildpackage hate quilt less

diff --git a/.gitignore b/.gitignore
index 4ff1108..4875fd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ltmain.sh
 missing
 stamp-h1
 ChangeLog
+.pc
\ No newline at end of file


-- 
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/e1nlsra-0004nl...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-25 Thread Christopher Halse Rogers 
 debian/changelog   |7 +++
 debian/patches/02_nouveau_bgnr |   24 
 debian/patches/series  |1 +
 3 files changed, 32 insertions(+)

New commits:
commit cba7bbd75f458ec24589b20ebc3d040ed00e0419
Author: Christopher James Halse Rogers 
Date:   Fri Feb 26 15:50:47 2010 +1100

Import bg none support patch from Fedora package to enable smooth 
Plymoth->GDM transition

diff --git a/debian/changelog b/debian/changelog
index 688e3b9..0419b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu3) UNRELEASED; 
urgency=low
+
+  * debian/patches/02_nouveau_bgnr
++ Add patch from Fedora package enabling smooth Plymouth->GDM transition.
+
+ -- Christopher James Halse Rogers   Fri, 26 Feb 2010 
15:49:20 +1100
+
 xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu2) lucid; 
urgency=low
 
   * debian/control
diff --git a/debian/patches/02_nouveau_bgnr b/debian/patches/02_nouveau_bgnr
new file mode 100644
index 000..a53d99e
--- /dev/null
+++ b/debian/patches/02_nouveau_bgnr
@@ -0,0 +1,24 @@
+From 5428142140f578a0a73f288fdf821ace9fea6a60 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs 
+Date: Mon, 8 Feb 2010 12:51:47 +1000
+Subject: [PATCH 2/2] set canDoBGNoneRoot
+
+---
+ src/nv_driver.c |1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 248a151..b5bc0a7 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -673,6 +673,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+   /* Set pScrn->monitor */
+   pScrn->monitor = pScrn->confScreen->monitor;
++  pScrn->canDoBGNoneRoot = 1;
+ 
+   /*
+* The first thing we should figure out is the depth, bpp, etc.
+-- 
+1.6.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ee1bce7..033393a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_include_snapshot_date
+02_nouveau_bgnr


-- 
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/e1nksac-0008fk...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-25 Thread Christopher Halse Rogers 
 debian/changelog |8 
 debian/control   |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c38124628104829e8c4c8da0103280733d361f3d
Author: Christopher James Halse Rogers 
Date:   Fri Feb 26 15:37:47 2010 +1100

Import -0ubuntu2 changes into git:

* debian/control
  + Add -pae as fulfilling dependency
(LP: #524792)

diff --git a/debian/changelog b/debian/changelog
index a8eb3d0..688e3b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu2) lucid; 
urgency=low
+
+  * debian/control
++ Add -pae as fulfilling dependency
+  (LP: #524792)
+
+ -- Bryce Harrington   Mon, 22 Feb 2010 21:32:09 -0800
+
 xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) lucid; 
urgency=low
 
   [ Christopher James Halse Rogers ]
diff --git a/debian/control b/debian/control
index d4e30a7..0895c94 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}, 
  ${xserver:Depends}, 
- linux-backports-modules-nouveau-lucid-generic
+ linux-backports-modules-nouveau-lucid-generic | 
linux-backports-modules-nouveau-lucid-generic-pae
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx
 Conflicts: nvidia-glx


-- 
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/e1nkrzm-0004nl...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-19 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit aa552e89e618a206f69a51b3f65b67102c548363
Author: Timo Aaltonen 
Date:   Fri Feb 19 14:49:45 2010 +0200

Release 1:0.0.15+git20100219+9b4118d-0ubuntu1.

diff --git a/debian/changelog b/debian/changelog
index d8c01f0..a8eb3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; 
urgency=low
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) lucid; 
urgency=low
 
+  [ Christopher James Halse Rogers ]
   * debian/dirs:
 + Create initramfs-tools hook directory.
   * debian/rules: 
@@ -15,7 +16,7 @@ xserver-xorg-video-nouveau 
(1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; u
   * debian/control:
 + Tighten libdrm-dev build-depend to >= 2.4.18~ for nouveau_class.h updates
 
- -- Christopher James Halse Rogers   Fri, 19 Feb 2010 
23:19:00 +1100
+ -- Timo Aaltonen   Fri, 19 Feb 2010 14:49:30 +0200
 
 xserver-xorg-video-nouveau (1:0.0.15+git20100128+2630a15-0ubuntu2) lucid; 
urgency=low
 

commit 613c72d495b0d2513be24f4618d5112e4f33632a
Author: Timo Aaltonen 
Date:   Fri Feb 19 14:49:14 2010 +0200

Add a missing comma in control.

diff --git a/debian/control b/debian/control
index aead551..d4e30a7 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7),
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
  x11proto-xext-dev,
- libdrm-dev (>= 2.4.18~)
+ libdrm-dev (>= 2.4.18~),
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  mesa-common-dev,


-- 
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/e1nislw-0006ii...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-19 Thread Christopher Halse Rogers 
 debian/changelog |8 +++-
 debian/control   |2 +-
 debian/postinst  |7 +++
 debian/postrm|5 +
 debian/rules |2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 1d46cf0f598e77ef03ceda2956d251d78292c7c7
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 23:19:35 2010 +1100

Tighten libdrm-dev version dependency for nouveau_class.h changes

diff --git a/debian/changelog b/debian/changelog
index eec7e6d..d8c01f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ xserver-xorg-video-nouveau 
(1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; u
   * debian/postrm:
 + Trigger update-initramfs on install and removal to ensure kms hook is 
   used.
+  * debian/control:
++ Tighten libdrm-dev build-depend to >= 2.4.18~ for nouveau_class.h updates
 
- -- Christopher James Halse Rogers   Fri, 19 Feb 2010 
21:22:39 +1100
+ -- Christopher James Halse Rogers   Fri, 19 Feb 2010 
23:19:00 +1100
 
 xserver-xorg-video-nouveau (1:0.0.15+git20100128+2630a15-0ubuntu2) lucid; 
urgency=low
 
diff --git a/debian/control b/debian/control
index e07c9ea..aead551 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7),
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
  x11proto-xext-dev,
- libdrm-dev (>= 2.4.17-1ubuntu1~),
+ libdrm-dev (>= 2.4.18~)
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  mesa-common-dev,

commit bdd1017b193e92a5961583a658783f07c6f179e5
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 23:09:56 2010 +1100

Add postinst and postrm update-initramfs triggers

diff --git a/debian/changelog b/debian/changelog
index f22f641..eec7e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xserver-xorg-video-nouveau 
(1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; u
   * debian/nouveau_kms
 + initramfs-tools hook to add lbm_nouveau to the initramfs, like the other
   KMS framebuffer drivers.
+  * debian/postinst:
+  * debian/postrm:
++ Trigger update-initramfs on install and removal to ensure kms hook is 
+  used.
 
  -- Christopher James Halse Rogers   Fri, 19 Feb 2010 
21:22:39 +1100
 
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 000..0b6bad7
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] ; then
+dpkg-trigger update-initramfs
+fi
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 000..f39a6f2
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+dpkg-trigger update-initramfs
+
+#DEBHELPER#
\ No newline at end of file

commit e35458618d48531b81d9a65576e11d92a69660d2
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 23:00:13 2010 +1100

Install nouveau_kms hook directly into the deb directory after dh_install

diff --git a/debian/rules b/debian/rules
index 2e6fd86..a3e032e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,6 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-   install -m755 debian/nouveau_kms 
debian/tmp/usr/share/initramfs-tools/hooks
 
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 
@@ -77,6 +76,7 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs
dh_install --sourcedir=debian/tmp --list-missing
+   install -m755 debian/nouveau_kms 
debian/xserver-xorg-video-nouveau/usr/share/initramfs-tools/hooks
dh_link
dh_strip
dh_compress


-- 
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/e1nirr7-0002qt...@alioth.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2010-02-19 Thread Christopher Halse Rogers 
 Makefile.in   |   17 +--
 aclocal.m4|  225 +++---
 configure |  244 +-
 debian/changelog  |   23 
 debian/control|2 
 debian/dirs   |1 
 debian/nouveau_kms|   18 +++
 debian/rules  |3 
 man/Makefile.in   |2 
 snapshot-date |1 
 src/Makefile.in   |2 
 src/drmmode_display.c |  173 +--
 src/nouveau_dri2.c|   37 +--
 src/nv04_exa.c|4 
 src/nv04_xv_blit.c|   22 ++--
 src/nv10_exa.c|2 
 src/nv50_accel.c  |5 -
 src/nv_accel_common.c |   26 ++---
 src/nv_driver.c   |   32 +-
 src/nv_proto.h|2 
 src/nv_type.h |   12 --
 21 files changed, 446 insertions(+), 407 deletions(-)

New commits:
commit 8fc68775c9d5567cee9f708f77988233c616c5a2
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 22:01:25 2010 +1100

Fix get-orig-source versioning harder; stray '+'s suck

diff --git a/debian/rules b/debian/rules
index 1cd9266..2e6fd86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ get-orig-source:
cd xf86-video-nouveau && autoreconf -v --install && \
git log |head -3|tail -1|tr -d '\n' > snapshot-date && \
REVISION=$$(git show --pretty=format:"%h" HEAD | head -n1) && cd .. && \
-   PREFIX=xserver-xorg-video-nouveau_0.0.15+git+$$(date 
+%Y%m%d)+$$REVISION && \
+   PREFIX=xserver-xorg-video-nouveau_0.0.15+git$$(date +%Y%m%d)+$$REVISION 
&& \
rm -rf xf86-video-nouveau/.git && \
tar czf $$PREFIX.orig.tar.gz --exclude=autom4te.cache 
xf86-video-nouveau && \
rm -rf xf86-video-nouveau

commit dd8b6f16eb74ffb06a8d34541e6b720c677206aa
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 21:26:57 2010 +1100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index aacb3e5..f22f641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; 
urgency=low
+
+  * debian/dirs:
++ Create initramfs-tools hook directory.
+  * debian/rules: 
++ Update get-orig-source target to create correctly versioned tarballs
++ Install nouveau_kms hook with executable permissions
+  * debian/nouveau_kms
++ initramfs-tools hook to add lbm_nouveau to the initramfs, like the other
+  KMS framebuffer drivers.
+
+ -- Christopher James Halse Rogers   Fri, 19 Feb 2010 
21:22:39 +1100
+
 xserver-xorg-video-nouveau (1:0.0.15+git20100128+2630a15-0ubuntu2) lucid; 
urgency=low
 
   * debian/control: Add dependency on meta package

commit 7b617b63101bb8243ec3b43c352f8778b0496880
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 21:04:09 2010 +1100

Install hook to add lbm_nouveau to initramfs

diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000..52c8c74
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/initramfs-tools/hooks
diff --git a/debian/nouveau_kms b/debian/nouveau_kms
new file mode 100755
index 000..fa4eaaf
--- /dev/null
+++ b/debian/nouveau_kms
@@ -0,0 +1,18 @@
+#!/bin/sh
+PREREQ=""
+prereqs()
+{
+echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+prereqs
+exit 0
+;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+# Begin real processing below this line
+
+manual_add_modules lbm_nouveau
diff --git a/debian/rules b/debian/rules
index e42221d..1cd9266 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,7 @@ install: build
dh_testroot
dh_prep
dh_installdirs
+   install -m755 debian/nouveau_kms 
debian/tmp/usr/share/initramfs-tools/hooks
 
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
 

commit 9dc12f0de18594c12301535bf89590671ef463f6
Author: Christopher James Halse Rogers 
Date:   Fri Feb 19 20:33:58 2010 +1100

Imported Upstream version 0.0.15+git+20100219+9b4118d

diff --git a/Makefile.in b/Makefile.in
index cc82c79..e8c4f19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,7 +340,7 @@ distclean-libtool:
 # (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-   @failcom='exit 1'; \
+   @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
  case $$f in \
*=* | --[!k]*);; \
@@ -365,7 +365,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-   @failcom='exit 1'; \
+   @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
  case $$f in \
*=* | --[!k]*

xserver-xorg-video-nouveau: Changes to 'ubuntu-jaunty'

2009-12-06 Thread Christopher Halse Rogers 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2009-12-06 Thread Christopher Halse Rogers 
 Makefile.in  |  771 ++
 aclocal.m4   | 9743 +
 config.guess | 1533 +
 config.h.in  |   91 
 config.sub   | 1693 ++
 configure|14303 +++
 debian/changelog |8 
 debian/control   |2 
 debian/gbp.conf  |6 
 depcomp  |  630 ++
 install-sh   |  519 +
 ltmain.sh| 8413 
 man/Makefile.in  |  479 +
 missing  |  376 +
 snapshot-date|1 
 src/Makefile.in  |  696 ++
 src/nv50_accel.c |   11 
 17 files changed, 39268 insertions(+), 7 deletions(-)

New commits:
commit ab62e795a380b96a1210de58e1d987d433fd499d
Author: Christopher James Halse Rogers 
Date:   Mon Dec 7 13:18:28 2009 +1100

Update snapshot date.
Replace linux-nouveau-modules dependency with a direct dependency on 
nouveau-kernel-source, and version it to ensure we've got a matching version

diff --git a/debian/changelog b/debian/changelog
index 80668a2..9622997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-xserver-xorg-video-nouveau (1:0.0.10~git+20091204+95fc663-0ubuntu1) lucid; 
urgency=low
+xserver-xorg-video-nouveau (1:0.0.10+git20091207+60a3942-0ubuntu1) lucid; 
urgency=low
 
-  * New upstream snapshot, up to commit 
-95fc663d5fb653fc0a50aa4d589bbf3b9c79e928.
+  * New upstream snapshot
 + Too many commits to usefully list in the changelog.
   * debian/control:
 + Bump versioned Build-Dep on libdrm-dev to >= 2.4.16~ to pick up nouveau
   #define updates.
++ Replace dependency on linux-nouveau-modules with nouveau-kernel-source.
+  This small divergence from Debian allows us to version the dependency
+  to help ensure an appropriate kernel module is available.
 
  -- Christopher James Halse Rogers   Fri, 04 Dec 2009 
12:31:58 +1100
 
diff --git a/debian/control b/debian/control
index da41dc3..855c3c0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: 
http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau.
 
 Package: xserver-xorg-video-nouveau
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, 
linux-nouveau-modules
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, 
nouveau-kernel-source (>= 0.0.15+git20091122)
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx
 Conflicts: nvidia-glx

commit 4162e080f2922f8aac0606b216990666b1f6e006
Author: Christopher James Halse Rogers 
Date:   Mon Dec 7 13:11:46 2009 +1100

Imported Upstream version 0.0.10+git20091207+60a3942

diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000..cc82c79
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,771 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+...@set_make@
+
+#  Copyright 2005 Adam Jackson.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation
+#  on the rights to use, copy, modify, merge, publish, distribute, sub
+#  license, and/or sell copies of the Software, and to permit persons to whom
+#  the Software is furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice (including the next
+#  paragraph) shall be included in all copies or substantial portions of the
+#  Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(progra

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2009-12-03 Thread Christopher Halse Rogers 
 debian/changelog  |   11 
 debian/control|2 
 src/drmmode_display.c |  567 
 src/nouveau_dri2.c|   68 --
 src/nouveau_exa.c |  110 ++-
 src/nouveau_hw.h  |   17 
 src/nouveau_wfb.c |   22 
 src/nouveau_xv.c  |   40 +
 src/nv04_exa.c|   86 ++-
 src/nv04_xv_blit.c|   26 
 src/nv10_exa.c| 1376 ++
 src/nv30_exa.c|   75 ++
 src/nv30_shaders.c|   27 
 src/nv30_shaders.h|4 
 src/nv30_xv_tex.c |   77 +-
 src/nv40_exa.c|   71 +-
 src/nv40_xv_tex.c |   66 +-
 src/nv50_accel.c  |  177 +++---
 src/nv50_crtc.c   |   40 -
 src/nv50_exa.c|  144 +++--
 src/nv50_xv.c |  104 ++-
 src/nv_accel_common.c |5 
 src/nv_crtc.c |   34 -
 src/nv_cursor.c   |   79 +-
 src/nv_driver.c   |   31 -
 src/nv_proto.h|6 
 src/nv_type.h |4 
 27 files changed, 1777 insertions(+), 1492 deletions(-)

New commits:
commit 3fbc682795264d8081d615abfbe7fc0647ad889b
Author: Christopher James Halse Rogers 
Date:   Fri Dec 4 15:41:34 2009 +1100

Update snapshot

diff --git a/debian/changelog b/debian/changelog
index b78af5c..80668a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-nouveau (1:0.0.10~git+20091204+95fc663-0ubuntu1) lucid; 
urgency=low
+
+  * New upstream snapshot, up to commit 
+95fc663d5fb653fc0a50aa4d589bbf3b9c79e928.
++ Too many commits to usefully list in the changelog.
+  * debian/control:
++ Bump versioned Build-Dep on libdrm-dev to >= 2.4.16~ to pick up nouveau
+  #define updates.
+
+ -- Christopher James Halse Rogers   Fri, 04 Dec 2009 
12:31:58 +1100
+
 xserver-xorg-video-nouveau (1:0.0.10~git+20090823+569a17a-0ubuntu1) karmic; 
urgency=low
 
   * Merge package from Debian experimental.  Remaining Ubuntu changes:
diff --git a/debian/control b/debian/control
index dce50cf..da41dc3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu MOTU Developers 
 XSBC-Original-Maintainer: Debian X Strike Force 
 Uploaders: Chris Lamb , Matthew Johnson 
-Build-Depends: debhelper (>= 7), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev 
(>= 2.4.12+git20090801.45078630), x11proto-xf86dri-dev, x11proto-gl-dev, 
mesa-common-dev, automake, libtool, xutils-dev, xserver-xorg-dev, quilt
+Build-Depends: debhelper (>= 7), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev 
(>= 2.4.16~), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, automake, 
libtool, xutils-dev, xserver-xorg-dev, quilt
 Standards-Version: 3.8.2
 Homepage: http://nouveau.freedesktop.org/wiki/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau

commit 95fc663d5fb653fc0a50aa4d589bbf3b9c79e928
Author: Ben Skeggs 
Date:   Thu Nov 26 13:10:45 2009 +1000

shadowfb: fix segv on fb resize

Signed-off-by: Ben Skeggs 

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8099b4..efc2826 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1120,7 +1120,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int 
height)
screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
   (!pNv->NoAccel || pNv->ShadowPtr) ?
   pNv->ShadowPtr : pNv->scanout->map);
-
+   scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
nouveau_bo_unmap(pNv->scanout);
 
for (i = 0; i < xf86_config->num_crtc; i++) {
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 4595940..a0656af 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -637,6 +637,7 @@ nouveau_xf86crtc_resize(ScrnInfoPtr scrn, int width, int 
height)
screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
   (!pNv->NoAccel || pNv->ShadowFB) ?
   pNv->ShadowPtr : pNv->scanout->map);
+   scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
nouveau_bo_unmap(pNv->scanout);
 
for (i = 0; i < xf86_config->num_crtc; i++) {

commit 1cf0cfa926dd78698ff8b8c2d776bcdaa6a867bd
Author: Ben Skeggs 
Date:   Thu Nov 26 10:04:43 2009 +1000

kms: zfill fb if we have no accel to do copy, better than random garbage

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d1e3ec3..e8099b4 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -171,8 +171,13 @@ drmmode_fbcon_copy(ScrnInfoPtr pScrn)
unsigned w = pScrn->virtualX, h = pScrn->virtualY;
int i, ret, fbcon_id = 0;
 
-   if (!pNv->exa_driver_pixmaps)
+   if (!pNv->exa_driver_pixmaps) {
+   if (n

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2009-08-26 Thread Christopher Halse Rogers 
New branch 'ubuntu' available with the following commits:
commit 576f82efbf54c800501f7fc742acb1f6920eb4ec
Author: Christopher James Halse Rogers 
Date:   Wed Aug 26 19:41:58 2009 +1000

Update changelog

commit 210b13cf5c84af8c5ea7f39d04fd6c2a28922571
Author: Christopher James Halse Rogers 
Date:   Wed Aug 26 19:40:34 2009 +1000

Update debian/xsfbs from pkg-xorg git.
No longer uses deprecated --print-installation-architecture.
Fixes bug #403316

commit 3a64a645f8a396392241189fe42fe8ad2eab5140
Author: Christopher James Halse Rogers 
Date:   Sun Aug 23 19:36:52 2009 +1000

* Merge package from Debian experimental.  Remaining Ubuntu changes:
  + debian/control:
- Remove mention of using module-assistant; we have a DKMS source 
package
- Add dependency on quilt for our snapshot-date patch
  + debian/rules:
- Call patch target
- Generate snapshot-date in get-orig-source
  + debian/patches/01_include_snapshot_date
- Use snapshot-date included by get-orig-source to define NV_DRIVER_DATE
  in configure.  Helps upstream identify obsolete drivers with Xorg.log
* New upstream snapshot.

commit e3c008067956163d91b5cd9a2a8920794b60180f
Merge: 58ed4d84de9a2718327d7864d227d418b84ebabf 
dce88a3d787398667baf015182fd5aaf245baed9
Author: Christopher James Halse Rogers 
Date:   Sun Aug 23 19:23:57 2009 +1000

Merge with debian-experimental
* Merge changelog entries
* Maintain build-depend on quilt; we still patch in a snapshot-date

commit 58ed4d84de9a2718327d7864d227d418b84ebabf
Merge: 9cd7ccfe087107b8332232e5a7a4512d886c3918 
92f271020a1b9486bd5890a00649aed3678ead62
Author: Christopher James Halse Rogers 
Date:   Sun Aug 23 19:13:14 2009 +1000

Merge branch 'upstream-ubuntu' into ubuntu

* upstream-ubuntu: (84 commits)
  nv50/xv: provide SYNC_TO_VBLANK attribute
  xv: disable overlay with kms for the moment
  dri2: call exaMoveInPixmap() before accessing driver pixmap private
  xv: call exaMoveInPixmap() for driver pixmaps
  nv50/exa: fix pointer increment in UploadSIFC
  wfb: don't default to linear when encountering a pixmap without bo
  Revert "nv50: enforce certain allignments on a tiled frontbuffer, as well 
as overallocate it a bit"
  nv50: enforce certain allignments on a tiled frontbuffer, as well as 
overallocate it a bit
  exa: default to enabling driver pixmaps if everything else is new enough
  exa: turn on new exa migration mode for driver pixmaps
  nv04-nv40/exa: set cliprect to drawing area for IFC
  dri: close before dropping master
  Set/Drop master in Enter/LeaveVT
  dri: close before taking down accel
  nv04-nv40: deal with framebuffer resize in !kms_enable mode
  nv50: deal with framebuffer resize for !kms_enable
  No wfb without KMS
  dri2: fix CopyRegion()
  dri2: merge DRI2BufferRec and nouveau_dri2_buffer into a single struct
  dri2: remove support for < version 3
  ...

commit 92f271020a1b9486bd5890a00649aed3678ead62
Author: Ben Skeggs 
Date:   Thu Aug 13 15:40:52 2009 +1000

nv50/xv: provide SYNC_TO_VBLANK attribute

commit ada1d36d7097c389c8e21707d36b3cdd6378db94
Author: Ben Skeggs 
Date:   Thu Aug 13 15:38:14 2009 +1000

xv: disable overlay with kms for the moment

commit 85b1c86983a39cb921bd68a8601785975c948e2d
Author: Ben Skeggs 
Date:   Mon Aug 10 11:42:15 2009 +1000

dri2: call exaMoveInPixmap() before accessing driver pixmap private

commit 292f46a0a0e031fc8a4256aa1eed91e3b2167acd
Author: Ben Skeggs 
Date:   Mon Aug 10 11:36:56 2009 +1000

xv: call exaMoveInPixmap() for driver pixmaps

commit 0210fbf01d61fb0541770d541b71396537bcb728
Author: Christoph Bumiller 
Date:   Sun Aug 9 14:53:28 2009 +0200

nv50/exa: fix pointer increment in UploadSIFC

We always output 'size' dwords to the ring buffer, so the pointer
should be advanced accordingly, independent of cpp.

commit 1ac7d83c1e46a164c4a3a3688de1bcde9e5a58e0
Author: Maarten Maathuis 
Date:   Sat Aug 8 19:41:02 2009 +0200

wfb: don't default to linear when encountering a pixmap without bo

- With exa "mixed" there are actually very valid cases where this happens.
- This fixes certain types of corruptions, like the yellow and black in a 
gimp window.

commit 64790e950e7f46e6f4f5b8486f8d0bd929cb5504
Author: Maarten Maathuis 
Date:   Fri Aug 7 16:12:41 2009 +0200

Revert "nv50: enforce certain allignments on a tiled frontbuffer, as well 
as overallocate it a bit"

This reverts commit dd72640c8133ee78304f875023134f214d94a630.

Moved to the kernel.

commit dd72640c8133ee78304f875023134f214d94a630
Author: Maarten Maathuis 
Date:   Fri Aug 7 11:56:29 2009 +0200

nv50: enforce certain allignments on a tiled frontbuffer, as well as 
overallocate it a bit

- There is reason to believe that with driver modifications (part of) this 
won't be needed.
- Until then this should fix "til

xserver-xorg-video-nouveau: Changes to 'ubuntu-jaunty'

2009-04-03 Thread Christopher Halse Rogers 
 debian/changelog  |   47 +
 debian/control|2 
 src/Makefile.am   |2 
 src/drmmode_display.c |   13 
 src/nouveau_bios.h|4 
 src/nouveau_calc.c|  614 
 src/nouveau_hw.c  |  971 +++
 src/nouveau_hw.h  |  335 +
 src/nouveau_local.h   |   12 
 src/nouveau_xv.c  |9 
 src/nv50_connector.c  |   12 
 src/nv50_crtc.c   |2 
 src/nv50_randr.c  |4 
 src/nv50reg.h |4 
 src/nv_bios.c | 1239 +-
 src/nv_crtc.c |  546 ++
 src/nv_cursor.c   |4 
 src/nv_driver.c   |7 
 src/nv_hw.c   |  927 -
 src/nv_include.h  |1 
 src/nv_output.c   |  216 +---
 src/nv_proto.h|   56 --
 src/nv_setup.c|   31 -
 src/nv_type.h |   26 -
 src/nvreg.h   |7 
 25 files changed, 2671 insertions(+), 2420 deletions(-)

New commits:
commit d748435ea4ea77b9e86e671041fc1da981249fa5
Author: Christopher James Halse Rogers 
Date:   Sat Apr 4 14:40:00 2009 +1100

New upstream snapshot.
Rebuild against fixed libdrm-dev to pick up libdrm-nouveau1 dependency

diff --git a/debian/changelog b/debian/changelog
index 202147f..759a079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+xserver-xorg-video-nouveau (1:0.0.10~git+20090404+11be9a9-0ubuntu1) jaunty; 
urgency=low
+
+  * New upstream snapshot.  Standing FFe is (LP: #346621).
+- 11be9a9... nv50: fix i2c port addresses
+- e2aa037... randr12: fall back to standard timings when finding
+  native mode (rh#492819)  
+- 6965663... randr12: fix hw cursor for fully transparent pixels
+- d12f70c... randr12: pre-nv17 digital fixes
+- ea567db... randr12: fix restore for cards where CR21 is not left
+  unlocked at POST 
+- bd263d8... randr12: make nv11 dvi work for both crtcs
+- 52c287d... Every card since nv5 can do panels
+- 3d371a7... randr12: enable tmds reg access on pre-nv17
+- 1bb85c8... randr12: reorder ramdac reg access
+- 4465fdd... randr12: remove nv30 special case
+- 72eced5... randr12: fix/improve a load of version/feature tests
+- 37c6916... bios: fix chips with pll limits table version 0
+- 76c5a05... bios: xf86DrvMsg->NV_ERROR
+- b1b9bcb... bios: support for pll limits table v3.0
+- 8c85b4b... kms: CONNECTORn -> CONNECTOR-n
+- 4e1c323... Restore call to NVDRIGetVersion, to ensure the dri
+  module is loaded 
+- c973f75... Abstract logging in nv_bios.c
+- b17bebd... nForce DIMM check is now in DRM
+- 9c991d3... randr12: FP_TG_CONTROL 2: dpms improvements
+- 5fb2888... randr12: FP_TG_CONTROL 1: turn off digital path when
+  using VGA encoder 
+- 8023dc3... Split DCB 1.5 parsing from 2.0+, get closer to 80 cols
+- ea027b3... The dcb prior to v1.5 is pretty hopeless, just add a crt.
+- 921fbcc... randr12: avoid nv11 chip lockup when saving palette regs
+- 9d46930... xv: oops
+- 9213c39... xv: post damage after we draw (rh#492239)
+- d68a052... kms: small cleanup
+- c9cb6a6... rh#492511 has a CRTC_OWNER of 0x7 for some reason
+- 95bff61... randr12: fix LVDS legitimately disconnected case
+- f86e395... randr12: permit vga outputs to be force enabled in xorg.conf
+- 8427b39... randr12: move a load of hw mode programming into nouveau_hw.c
+- 163bdce... Turn the smaller mmio wrappers into static inline
+- 21ee927... Put arbitration and mnp calcs in separate file
+- 83dc890... nv50: use E-EDID when available + apply edid quirks  
+  * debian/control:
+- Bump dependency on libdrm-dev to ensure rebuild with fixed
+  libdrm-nouveau1.symbols file.  Fixes missing Depends: on
+  libdrm-nouveau1
+
+ -- Christopher James Halse Rogers   Sat, 04 Apr 2009 
14:35:12 +1100
+
 xserver-xorg-video-nouveau (1:0.0.10~git+20090327+f1907dc-0ubuntu1) jaunty; 
urgency=low
 
   * New upstream snapshot.  Standing FFe is (LP: #346621).
diff --git a/debian/control b/debian/control
index 8715ab1..fac9352 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu MOTU Developers 
 XSBC-Original-Maintainer: Debian X Strike Force 
 Uploaders: Chris Lamb , Matthew Johnson 
-Build-Depends: debhelper (>= 7), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev 
(>= 2.4.4+git+20090105+a8c5480), x11proto-xf86dri-dev, x11proto-gl-dev, 
mesa-common-dev, automake, libtool, xutils-dev, xserver-xorg-dev, quilt
+Build-Depends: debhelper (>= 7), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, 
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev 
(>= 2.4.5-0ubuntu4),

xserver-xorg-video-nouveau: Changes to 'ubuntu-jaunty'

2009-03-28 Thread Christopher Halse Rogers 
 .gitignore  |1 -
 debian/changelog|7 ++-
 debian/patches/01_include_snapshot_date |   12 +++-
 debian/rules|4 ++--
 src/drmmode_display.c   |5 +++--
 src/nv50_randr.c|8 
 src/nv50_xv.c   |   10 +-
 src/nv_crtc.c   |2 +-
 src/nv_driver.c |4 
 9 files changed, 36 insertions(+), 17 deletions(-)

New commits:
commit cb41865b5da97bb791c472fec7a882ee68ee1d26
Author: Christopher James Halse Rogers 
Date:   Sun Mar 29 10:43:02 2009 +1100

Revert "Add stampdir to .gitignore, so git-buildpackage stops having 
screaming hissy fits"
This is no longer necessary, now that we remove stampdir on clean.

This reverts commit 0190d14466eebdddfc6389d4f4bab9756d5cf720.

diff --git a/.gitignore b/.gitignore
index 5636e09..4ff1108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,3 @@ ltmain.sh
 missing
 stamp-h1
 ChangeLog
-stampdir
\ No newline at end of file

commit 4d94cb3eea8b388dba4771554086afe919c567ce
Author: Christopher James Halse Rogers 
Date:   Sun Mar 29 10:42:22 2009 +1100

Add LP magic to changelog, mention remove-stampdir-on-clean

diff --git a/debian/changelog b/debian/changelog
index dd0ddfa..202147f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-nouveau (1:0.0.10~git+20090327+f1907dc-0ubuntu1) jaunty; 
urgency=low
 
-  * New upstream snapshot
+  * New upstream snapshot.  Standing FFe is (LP: #346621).
+- New snapshot fixes crash in NoAccel code path (LP: #345530)
+- New snapshot fixes incorrect resolution after exit from some
+  fullscreen applications, such as Battle for Westnoth (LP: #323619)
 - f1907dc... nv50: add default modes to mode pool for LVDS panel
 - 7da6fdb... kms: fix bug which prevented getting edid from the kernel
 - f431e20... randr: fix crash when rotation requested
 - 36dedd0... kms: check for mm_enabled as an additional test for kms
   presence
+- a923bc1... nv50/xv: correct rendering to partically obscured windows
 - 01cee29... nv50: call NVSync() in CloseScreen() before restoring
   video mode
 - aa7c037... kms: implement AdjustFrame, should fix crash in fdo#24236
@@ -161,6 +165,7 @@ xserver-xorg-video-nouveau 
(1:0.0.10~git+20090327+f1907dc-0ubuntu1) jaunty; urge
 - ba1f897... keep resources around after leavevt, far too problematic
 currently
   * debian/rules
++ Remove stampdir/ on clean; fixes build-twice-in-a-row.
   * debian/patches/01_include_snapshot_date
 + Generate snapshot-date in get-orig-source, and use it rather than
   git log to define NV_DRIVER_DATE

commit b23730da621e51258de51678a72be6d24f2e3b88
Author: Christopher James Halse Rogers 
Date:   Sun Mar 29 10:31:26 2009 +1100

Use just xsfbs.mk's quilt patch target, and remove stampdir/ on clean

diff --git a/debian/rules b/debian/rules
index 3240999..89c01c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
--include debian/xsfbs/xsfbs.mk
+include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -59,6 +58,7 @@ clean: unpatch
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
+   rm -rf stampdir
 
dh_clean
 

commit 45edf7d77f62685d4f59a6e14ba77632080130c9
Author: Christopher James Halse Rogers 
Date:   Sun Mar 29 10:00:16 2009 +1100

Fix path to snapshot-date in configure patch.

We call configure from $(srcdir)/$ARCH-TRIPLE, so snapshot-date is in 
$(pwd)/..

diff --git a/debian/patches/01_include_snapshot_date 
b/debian/patches/01_include_snapshot_date
index 7821f17..76fb0c0 100644
--- a/debian/patches/01_include_snapshot_date
+++ b/debian/patches/01_include_snapshot_date
@@ -1,13 +1,15 @@
 Index: xserver-xorg-video-nouveau/configure
 ===
 xserver-xorg-video-nouveau.orig/configure  2009-03-27 19:14:01.435615848 
+1100
-+++ xserver-xorg-video-nouveau/configure   2009-03-27 19:14:27.175615987 
+1100
-@@ -2084,7 +2084,7 @@
- 
+--- xserver-xorg-video-nouveau.orig/configure  2009-03-29 09:44:13.292677296 
+1100
 xserver-xorg-video-nouveau/configure   2009-03-29 09:58:42.032677435 
+1100
+@@ -2082,9 +2082,8 @@
+ #define NV_PATCHLEVEL $(echo $PACKAGE_VERSION | sed -e 
's/^[0-9]\.[0-9]\.\([0-9]\)/\1/')
+ _ACEOF
  
+-
  cat >>confdefs.h <<_ACEOF
 -#define NV_DRIVER_DATE $(echo -n \";git log |head -3|tail -1|tr -d '\n';echo 
-n \")
-+#define NV_DRIVER_DATE $(echo -n \";cat snapshot-date;echo -n \")
++#define NV_DRIVER_DATE $(echo -n \";cat ../snapshot-date;echo -n \")
  _ACEOF
  
  

commit f1907dcef8d06d7ee4ef10ba22bb7decef700110
Author: Ben Skeggs 
Date:   Fri Mar 27 15:37

xserver-xorg-video-nouveau: Changes to 'ubuntu-jaunty'

2009-03-27 Thread Christopher Halse Rogers 
 .gitignore  |1 
 debian/changelog|  127 -
 debian/control  |3 
 debian/patches/0001-Fix-with-kms-no-build.patch |   32 -
 debian/patches/01_include_snapshot_date |   13 
 debian/patches/series   |2 
 debian/rules|3 
 src/drmmode_display.c   |   21 
 src/nouveau_bios.h  |   11 
 src/nouveau_xv.c|   16 
 src/nv10_xv_ovl.c   |6 
 src/nv50_connector.c|4 
 src/nv50_randr.c|4 
 src/nv_bios.c   |  105 ++--
 src/nv_crtc.c   |  401 +-
 src/nv_cursor.c |8 
 src/nv_dac.c|   14 
 src/nv_dri.c|   15 
 src/nv_driver.c |   53 +-
 src/nv_hw.c |   94 ++--
 src/nv_output.c |   91 ++--
 src/nv_proto.h  |1 
 src/nv_setup.c  |   52 +-
 src/nv_type.h   |   51 +-
 src/nvreg.h |  521 +++-
 25 files changed, 848 insertions(+), 801 deletions(-)

New commits:
commit 0190d14466eebdddfc6389d4f4bab9756d5cf720
Author: Christopher James Halse Rogers 
Date:   Fri Mar 27 21:26:30 2009 +1100

Add stampdir to .gitignore, so git-buildpackage stops having screaming 
hissy fits

diff --git a/.gitignore b/.gitignore
index 4ff1108..5636e09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ltmain.sh
 missing
 stamp-h1
 ChangeLog
+stampdir
\ No newline at end of file

commit 619bc1b834a68b695aab9952526722906740d18a
Author: Christopher James Halse Rogers 
Date:   Fri Mar 27 20:48:43 2009 +1100

Really delete no longer necessary no-kms buildfix patch

diff --git a/debian/patches/0001-Fix-with-kms-no-build.patch 
b/debian/patches/0001-Fix-with-kms-no-build.patch
deleted file mode 100644
index 1b21516..000
--- a/debian/patches/0001-Fix-with-kms-no-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 45a5c55a318cb28ea44d7bfb19d9160da4eee855 Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers 
-Date: Tue, 24 Mar 2009 17:28:39 +1100
-Subject: [PATCH] Fix --with-kms=no build.
-
-Commit 98c9e4edb58374f18249e5c9c53b392fb8b4a1d1 introduced some unguarded 
pNv->allow_dpms usage, but this is only defined when XF86MODE is defined

- src/nv_driver.c |4 
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index ec4577f..f7915a8 100644
 a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -684,10 +684,14 @@ NVEnterVT(int scrnIndex, int flags)
-   return FALSE;
-   NVAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-   } else {
-+#ifdef XF86DRM_MODE
-   pNv->allow_dpms = FALSE;
-+#endif
-   if (!xf86SetDesiredModes(pScrn))
-   return FALSE;
-+#ifdef XF86DRM_MODE
-   pNv->allow_dpms = TRUE;
-+#endif
-   }
- 
-   if (pNv->overlayAdaptor && pNv->Architecture != NV_ARCH_04)
--- 
-1.6.0.4
-

commit e2323fecef460c2056ad31341fa96710b402d9e4
Author: Christopher James Halse Rogers 
Date:   Fri Mar 27 20:47:31 2009 +1100

Remove reference to drm-modules-source from long description

diff --git a/debian/changelog b/debian/changelog
index a186266..dd0ddfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,6 +164,10 @@ xserver-xorg-video-nouveau 
(1:0.0.10~git+20090327+f1907dc-0ubuntu1) jaunty; urge
   * debian/patches/01_include_snapshot_date
 + Generate snapshot-date in get-orig-source, and use it rather than
   git log to define NV_DRIVER_DATE
+  * debian/control
++ Remove reference to drm-modules-source package from long description.
+  Ubuntu ships a DKMS-ified nouveau-kernel-source package, which makes
+  this unnecessary.
 
  -- Christopher James Halse Rogers   Fri, 27 Mar 2009 
20:41:22 +1100
 
diff --git a/debian/control b/debian/control
index 3872c0d..8715ab1 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,3 @@ Description: X.Org X server -- Nouveau display driver 
(experimental)
  use the non-free "nvidia" driver.
  .
  This package is built from the FreeDesktop.org xf86-video-nouveau driver.
- .
- Users wishing to install these drivers should first use module-assistant to
- build the drm kernel modules (via ``module-assistant auto-install drm'').

commit 5cd4ac83dc033d1162df182ab07d2afec0858ad9
Author: Christopher James Halse Rogers 
Date:   Fri Mar 27 20:43:36 2009 +1100

Update snapshot
Add NV_DRIVER_DATE patch
R

xserver-xorg-video-nouveau: Changes to 'ubuntu-jaunty'

2009-03-24 Thread Christopher Halse Rogers 
New branch 'ubuntu-jaunty' available with the following commits:
commit 50e253a9005e6df74af656e4165090ed62a0b6a4
Author: Christopher James Halse Rogers 
Date:   Tue Mar 24 20:42:49 2009 +1100

Build with --with-kms=no (required for Ubuntu DRM headers).
Add a patch to fix --with-kms=no, and quilt patchsystem to apply it

commit faa15918a7307adc4ba17e4747af9ed1b5dd1498
Author: Christopher James Halse Rogers 
Date:   Tue Mar 24 17:19:25 2009 +1100

Munge maintainer field as per MaintainerFieldSpec

commit 805070fc35d6cb6d5f2987fb7060898030eec5a7
Author: Christopher James Halse Rogers 
Date:   Sun Mar 22 20:26:39 2009 +1100

Fix package version in debian/changelog

commit 328f8a32b6e3b1faeef67111f252be87cddb286d
Author: Christopher James Halse Rogers 
Date:   Sun Mar 22 20:11:15 2009 +1100

New upstream snapshot

commit e6f07dfb7d6ca922cb747419fd60e3313bd60427
Merge: d87aa85a62f7221bf59ea567596e108370b822ab 
3e7fa97a50e42c0255876c79137dc1a40a6052a6
Author: Christopher James Halse Rogers 
Date:   Sun Mar 22 17:08:45 2009 +1100

Merge branch 'upstream-ubuntu-jaunty' into ubuntu-jaunty

* upstream-ubuntu-jaunty: (102 commits)
  dri: pass object handle instead of offset if using real mm
  dri2: initial implementation, only with driver pixmaps
  kms: support framebuffer resize if driver pixmaps enabled
  kms: copy old fb to new fb on modeset
  Call NVEnterVT from NVScreenInit rather than duplicating it.
  exa: fix multiple prepare/finish_access on a pixmap
  Wrap bios endian casting
  Switch to using pll_vals struct for passing pll stuff around
  randr12: cull old unused pll code
  Don't pointlessly overallocate cursor storage
  randr12: nv10 hw cursor fixes/changes
  randr12: use nv0x cursor colour expansion funcs on later cards, unify 
argb paths
  randr12: store nv0x hw cursor image in VRAM
  Kill pre-randr12 hwcursor code, and tidy randr12 hwcursor code
  Remove calls to load ddc and i2c modules -- they're built-in since server 
1.3
  Hack around missing display table in rdivacky's GeForce 7050 PV/nForce 
630a
  Fix xserver shutdown for randr12 off
  Remove bios lvds parsing pxclk test; ddc_permitted is a sufficient 
condition
  Name some regs/values and reduce crtc reg struct size
  improve drm/dri initialisation code
  ...

commit 3e7fa97a50e42c0255876c79137dc1a40a6052a6
Author: Ben Skeggs 
Date:   Wed Mar 18 09:36:33 2009 +1000

dri: pass object handle instead of offset if using real mm

commit 88efe405213a3ea23edd9bed971da1d2492021eb
Author: Ben Skeggs 
Date:   Mon Mar 16 17:45:49 2009 +1000

dri2: initial implementation, only with driver pixmaps

Also, no DRI1 when driver pixmaps enabled.

commit 675126e0f0c1c077bde4b25ccb64f87d1d08547b
Author: Ben Skeggs 
Date:   Mon Mar 16 15:06:31 2009 +1000

kms: support framebuffer resize if driver pixmaps enabled

commit 8b354b92a859cf277b19e51fc6cb109f4ea44b7a
Author: Ben Skeggs 
Date:   Mon Mar 16 13:13:07 2009 +1000

kms: copy old fb to new fb on modeset

Requires driver pixmaps enabled, which suck on G8x currently.  Paves the
way for a nicer transition from console->X.  There's still a flash where
the screen goes black before X starts here, but this is on the way to what
we want.

commit 6658403cfd91556d06afecdde03feec7384c5398
Author: Ben Skeggs 
Date:   Mon Mar 16 12:34:49 2009 +1000

Call NVEnterVT from NVScreenInit rather than duplicating it.

commit f59fef15c94fc5c6f216d0f5dcdcb3d3188c0049
Author: Ben Skeggs 
Date:   Mon Mar 16 09:17:29 2009 +1000

exa: fix multiple prepare/finish_access on a pixmap

commit 75a1c4158a19bf0857de49b736fb87a40c095048
Author: Stuart Bennett 
Date:   Sat Mar 14 15:48:39 2009 +

Wrap bios endian casting

Also convert some functions to use individual bios pointers, rather than
bios->data[offset + ...
Plus some minor bmp structure documentation and tidying

commit 3666d7ecbdd3a4941a76af2528113db427bb
Author: Stuart Bennett 
Date:   Wed Feb 25 20:21:42 2009 +

Switch to using pll_vals struct for passing pll stuff around

commit a3dbc06d4f9dc340f5c167b94d8e10ac8386c5b4
Author: Stuart Bennett 
Date:   Fri Apr 11 16:51:30 2008 +0100

randr12: cull old unused pll code

commit 71c821b8119cbac8dcd91b27e3b7556d00ceb546
Author: Stuart Bennett 
Date:   Sat Mar 14 19:06:12 2009 +

Don't pointlessly overallocate cursor storage

commit 7284c07a0ad6551ea99c28454f4e7308699835e6
Author: Stuart Bennett 
Date:   Fri Mar 13 21:23:48 2009 +

randr12: nv10 hw cursor fixes/changes

Remove access to PCRTC_GPIO, it's unused and on NV10 overwrites
PCRTC_CURSOR_CONFIG leading to all sorts of cursor weirdness

NV10 hw cursor is now set-up on the assumption it can do 64x64 (we've been
using 64x32 up to now), but if it can't do cursors 64px high it can easily
be fixed to behave like nv0x at 32x32 (64x32's pretty s