ChangeLog | 54 +++++++++++++++++++++++++++++ configure.ac | 2 - debian/changelog | 7 +++ debian/patches/02-kms-edid-block-fix.patch | 30 ---------------- debian/patches/series | 1 src/drmmode_display.c | 9 +++- src/nv_driver.c | 3 + src/nvc0_shader.h | 4 +- src/nve0_shader.h | 4 +- 9 files changed, 73 insertions(+), 41 deletions(-)
New commits: commit f50aff8ea4531826e0807339f83a21217c27c67a Author: Maarten Lankhorst <[email protected]> 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 <[email protected]> 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..0000000 --- a/debian/patches/02-kms-edid-block-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 3b33a0b426b8915f302247dcd40c64fb1a6dcdd2 -Author: Emil Velikov <[email protected]> -Date: Sun Nov 4 18:06:18 2012 +0000 - - 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 <[email protected]> - Signed-off-by: Ben Skeggs <[email protected]> - -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 74d397e6bbd88e778ba4f4b7608f8fee00a62682 Author: Maarten Lankhorst <[email protected]> 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 <[email protected]> +Date: Mon Jan 7 14:13:10 2013 +1000 + + bump to 1.0.6 + + Signed-off-by: Dave Airlie <[email protected]> + +commit 00834273e22f7234a3755269100ea3f10b521e35 +Author: Dave Airlie <[email protected]> +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 <[email protected]> + +commit 389b8a8dd91a48dee524eac96e60813c507f1a82 +Author: Ben Skeggs <[email protected]> +Date: Mon Jan 7 14:05:06 2013 +1000 + + bump to 1.0.5 + + Signed-off-by: Ben Skeggs <[email protected]> + +commit efe9c57af6ff4c12936e49ac3e188c54b8b2d5bd +Author: Ben Skeggs <[email protected]> +Date: Mon Jan 7 11:35:56 2013 +1000 + + nvc0-/exa: fix typo which caused breakage in rendercheck tmcoords test + + Signed-off-by: Ben Skeggs <[email protected]> + +commit 5cd86445272818ec2f598f4685a5d7f24e403d07 +Author: Marcin Slusarz <[email protected]> +Date: Sun Nov 25 22:59:49 2012 +0100 + + add some missing newlines in error messages + + Signed-off-by: Ben Skeggs <[email protected]> + +commit 3b33a0b426b8915f302247dcd40c64fb1a6dcdd2 +Author: Emil Velikov <[email protected]> +Date: Sun Nov 4 18:06:18 2012 +0000 + + 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 <[email protected]> + Signed-off-by: Ben Skeggs <[email protected]> + commit 018ab2d4634f3c8923038337ce9600973e2f0002 Author: Ben Skeggs <[email protected]> Date: Fri Nov 9 12:16:00 2012 +1000 diff --git a/debian/changelog b/debian/changelog index 3f3693c..d27dac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -xserver-xorg-video-nouveau (1:1.0.4-2) UNRELEASED; urgency=low +xserver-xorg-video-nouveau (1:1.0.6-1) UNRELEASED; urgency=low + [ Sven Joachim ] * Bump build-dependency on libdrm-dev to (>= 2.4.40-1) and add an override for the resulting lintian warning. + [ Maarten Lankhorst ] + * New upstream release. + -- Sven Joachim <[email protected]> Sun, 06 Jan 2013 14:56:59 +0100 xserver-xorg-video-nouveau (1:1.0.4-1) experimental; urgency=low commit 8f934fad5d4934936b3265f272ca81e73c60d7dc Author: Dave Airlie <[email protected]> Date: Mon Jan 7 14:13:10 2013 +1000 bump to 1.0.6 Signed-off-by: Dave Airlie <[email protected]> diff --git a/configure.ac b/configure.ac index 3428be1..7535bfe 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-nouveau], - [1.0.5], + [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-nouveau]) commit 00834273e22f7234a3755269100ea3f10b521e35 Author: Dave Airlie <[email protected]> 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 <[email protected]> diff --git a/src/nv_driver.c b/src/nv_driver.c index de09f53..f14c847 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -454,9 +454,10 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap); + DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); PixmapSyncDirtyHelper(dirty, &pixregion); - DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); + DamageRegionProcessPending(&dirty->slave_dst->drawable); RegionUninit(&pixregion); } commit 389b8a8dd91a48dee524eac96e60813c507f1a82 Author: Ben Skeggs <[email protected]> Date: Mon Jan 7 14:05:06 2013 +1000 bump to 1.0.5 Signed-off-by: Ben Skeggs <[email protected]> diff --git a/configure.ac b/configure.ac index ff9c337..3428be1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-nouveau], - [1.0.4], + [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-nouveau]) commit efe9c57af6ff4c12936e49ac3e188c54b8b2d5bd Author: Ben Skeggs <[email protected]> Date: Mon Jan 7 11:35:56 2013 +1000 nvc0-/exa: fix typo which caused breakage in rendercheck tmcoords test Signed-off-by: Ben Skeggs <[email protected]> diff --git a/src/nvc0_shader.h b/src/nvc0_shader.h index 4d1679e..41bc065 100644 --- a/src/nvc0_shader.h +++ b/src/nvc0_shader.h @@ -73,8 +73,8 @@ NVC0VP_Transform2[] = { 0x58004000, 0x10011c40, 0x58004001, - 0x00109c40, - 0x30044001, + 0xc0109c40, + 0x30044000, 0xf010dc40, 0x30064000, 0x20111c40, diff --git a/src/nve0_shader.h b/src/nve0_shader.h index 4705075..5d8e9dd 100644 --- a/src/nve0_shader.h +++ b/src/nve0_shader.h @@ -67,8 +67,8 @@ NVE0VP_Transform2[] = { 0x58004000, 0x10011c40, 0x58004001, - 0x00109c40, - 0x30044001, + 0xc0109c40, + 0x30044000, 0xf010dc40, 0x30064000, 0x20111c40, commit 5cd86445272818ec2f598f4685a5d7f24e403d07 Author: Marcin Slusarz <[email protected]> Date: Sun Nov 25 22:59:49 2012 +0100 add some missing newlines in error messages Signed-off-by: Ben Skeggs <[email protected]> diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 8ec69f5..429e9cc 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -357,7 +357,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, if (ret) { xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, - "failed to set mode: %s", strerror(-ret)); + "failed to set mode: %s\n", strerror(-ret)); return FALSE; } @@ -532,7 +532,7 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue, size, red, green, blue); if (ret != 0) { xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, - "failed to set gamma: %s", strerror(-ret)); + "failed to set gamma: %s\n", strerror(-ret)); } } commit 3b33a0b426b8915f302247dcd40c64fb1a6dcdd2 Author: Emil Velikov <[email protected]> Date: Sun Nov 4 18:06:18 2012 +0000 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 <[email protected]> Signed-off-by: Ben Skeggs <[email protected]> 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 */ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
