Bug#995809: libinput: please make the build reproducible
Source: libinput
Version: 1.19.1-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
libinput could not be built reproducibly.
This is due to the use of the LIBINPUT_QUIRKS_DIR macro which includes
the absolute build path.
It is not entirely clear (during a very brief look) when/where this
value is even used — the testsuite still passes even if this is set to
a dummy value (see attached dummy patch). And, of course, the build
path cannot be relied upon at runtime.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0001-reproducible-build.patch 1970-01-01
01:00:00.0 +0100
--- b/debian/patches/0001-reproducible-build.patch 2021-10-06
10:05:03.555141278 +0100
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2021-10-06
+
+--- libinput-1.19.1.orig/meson.build
libinput-1.19.1/meson.build
+@@ -13,7 +13,7 @@ dir_libexec = get_option('prefix') /
+ dir_lib = get_option('prefix') / get_option('libdir')
+ dir_man1= get_option('prefix') / get_option('mandir') / 'man1'
+ dir_system_udev = get_option('prefix') / 'lib' / 'udev'
+-dir_src_quirks = meson.current_source_dir() / 'quirks'
++dir_src_quirks = '/nonexistent'
+ dir_src_test= meson.current_source_dir() / 'test'
+ dir_src = meson.current_source_dir() / 'src'
+
--- a/debian/patches/series 2021-10-06 09:35:40.889907597 +0100
--- b/debian/patches/series 2021-10-06 10:00:57.178902346 +0100
@@ -1 +1,2 @@
#placeholder
+0001-reproducible-build.patch
Bug#992773: spirv-cross: please make the build reproducible
Source: spirv-cross Version: 2021.01.15-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0] we noticed that spirv-cross could not be built reproducibly. This is because it embeds a timestamp via CMake. As the timestamp is not very useful in this particular context (it is positioned next to an "unknown" Git commit), a patch is attached that simply replaces the entire thing with a string that denotes that the binary is from the Debian package. [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/debian/patches/0001-reproducible-build.patch 1970-01-01 01:00:00.0 +0100 --- b/debian/patches/0001-reproducible-build.patch 2021-08-23 09:23:00.567312730 +0100 @@ -0,0 +1,14 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2021-08-23 + +--- spirv-cross-2021.01.15.orig/cmake/gitversion.in.h spirv-cross-2021.01.15/cmake/gitversion.in.h +@@ -1,6 +1,6 @@ + #ifndef SPIRV_CROSS_GIT_VERSION_H_ + #define SPIRV_CROSS_GIT_VERSION_H_ + +-#define SPIRV_CROSS_GIT_REVISION "Git commit: @spirv-cross-build-version@ Timestamp: @spirv-cross-timestamp@" ++#define SPIRV_CROSS_GIT_REVISION "(Debian package)" + + #endif --- a/debian/patches/series 1970-01-01 01:00:00.0 +0100 --- b/debian/patches/series 2021-08-23 09:22:59.659300774 +0100 @@ -0,0 +1 @@ +0001-reproducible-build.patch
Bug#945105: intel-gpu-tools: please make the build reproducible
Chris Lamb wrote: > [..] Friendly ping on this? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#945105: intel-gpu-tools: please make the build reproducible
Dear Maintainer, > Source: intel-gpu-tools > Version: 1.2-1 > Tags: patch There hasn't seem to be any update on this bug in 294 days, in which time the Reproducible Builds effort has come on a long way. Would you consider applying this patch and uploading? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#945105: intel-gpu-tools: please make the build reproducible
Dear Maintainer, > Source: intel-gpu-tools > Version: 1.2-1 > Tags: patch There hasn't seem to be any update on this bug in 294 days, in which time the Reproducible Builds effort has come on a long way. Would you consider applying this patch and uploading? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#909782: libinput: please make the build reproducible
Hi Julien, > The patch doesn't seem quite right, so I don't think we should apply it > as-is. It seems to me LIBINPUT_QUIRKS_SRCDIR shouldn't be in the > shipped packages at all, so a patch that fixes that and can be sent > upstream would be better. I would agree. I blame "2018 lamby" for his shortsightedness. Hopefully someone can step up and write/submit this patch. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org chris-lamb.co.uk `-
Bug#909782: libinput: please make the build reproducible
Dear Maintainer, > Source: libinput > Version: 1.12.6-2+deb10u1 > Tags: patch There hasn't seem to be any update on this bug in 703 days, in which time the Reproducible Builds effort has come on a long way. Would you consider applying this patch and uploading? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#945105: intel-gpu-tools: please make the build reproducible
Source: intel-gpu-tools
Version: 1.24-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
intel-gpu-tools could not be built reproducibly.
This is because it embedded the path to the test directory in the
binary. As we don't even build the tests (according to a comments,
they FTBFS...) my attached patch is almost-certainly harmless.
Patch attached.
[0] https://reproducible-builds.org/
Best wishes,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/0001_Reproducible-builds.patch 1969-12-31
19:00:00.0 -0500
--- b/debian/patches/0001_Reproducible-builds.patch 2019-11-19
12:58:31.782550136 -0500
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2019-11-19
+
+--- intel-gpu-tools-1.24.orig/lib/meson.build
intel-gpu-tools-1.24/lib/meson.build
+@@ -112,7 +112,7 @@ if chamelium.found()
+ lib_sources += 'igt_chamelium_stream.c'
+ endif
+
+-srcdir = join_paths(meson.source_root(), 'tests')
++srcdir = join_paths('.', 'tests')
+
+ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ fallback : 'NO-GIT',
--- a/debian/patches/series 2019-11-19 10:28:42.584479614 -0500
--- b/debian/patches/series 2019-11-19 12:34:03.769612335 -0500
@@ -1 +1,2 @@
#placeholder
+0001_Reproducible-builds.patch
Bug#909782: libinput: please make the build reproducible
Source: libinput
Version: 1.12.0-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
Hi,
Whilst working on the Reproducible Builds effort [0], we noticed
that libinput could not be built reproducibly.
This is due to the LIBINPUT_QUIRKS_SRCDIR config.h variable including
the absolute build path to find the test-time input file.
Patch attached that uses a relative path instead. I'm not sure upstream
will like this patch, it is provided mostly as a demonstration
ofthe problem. However perhaps it could be modified to take an
environment variable instead? I will leave this with you.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible-build.patch 1970-01-01 01:00:00.0
+0100
--- b/debian/patches/reproducible-build.patch 2018-09-28 09:19:11.556126306
+0100
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb
+Last-Update: 2018-09-28
+
+--- libinput-1.12.0.orig/meson.build
libinput-1.12.0/meson.build
+@@ -12,7 +12,7 @@ dir_libexec = join_paths(get_option(
+ dir_lib = join_paths(get_option('prefix'), get_option('libdir'))
+ dir_man1= join_paths(get_option('prefix'), get_option('mandir'),
'man1')
+ dir_system_udev = join_paths(get_option('prefix'), 'lib', 'udev')
+-dir_src_quirks = join_paths(meson.source_root(), 'quirks')
++dir_src_quirks = '../quirks'
+ dir_src_test= join_paths(meson.source_root(), 'test')
+ dir_src = join_paths(meson.source_root(), 'src')
+
--- a/debian/patches/series 1970-01-01 01:00:00.0 +0100
--- b/debian/patches/series 2018-09-28 09:18:30.095886370 +0100
@@ -0,0 +1 @@
+reproducible-build.patch
Bug#906012: libxcursor: CVE-2015-9262
block 906012 by 906042 thanks Hi, > Looks fine, please upload to security-master: As discussed elsewhere we will not be doing a DSA for this. I've filed an s-p-u request as https://bugs.debian.org/906042. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#906012: libxcursor: CVE-2015-9262
Hi security team,
> libxcursor: CVE-2015-9262
I have prepared an update for stretch:
libxcursor (1:1.1.14-1+deb9u2) stretch-security; urgency=high
* Non-maintainer upload by the Security Team.
* Fix a denial of service or potentially code execution via
a one-byte heap overflow. (CVE-2015-9262) Closes: #906012)
-- Chris Lamb Mon, 13 Aug 2018 09:09:13 +0200
Full debdiff attached. Permission to upload to stretch-security?
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for libxcursor_1.1.14-1+deb9u1 libxcursor_1.1.14-1+deb9u2
debian/patches/CVE-2015-9262.patch | 23 +++
libxcursor-1.1.14/debian/changelog |8
libxcursor-1.1.14/debian/patches/series |1 +
3 files changed, 32 insertions(+)
diff -u libxcursor-1.1.14/debian/changelog libxcursor-1.1.14/debian/changelog
--- libxcursor-1.1.14/debian/changelog
+++ libxcursor-1.1.14/debian/changelog
@@ -1,3 +1,11 @@
+libxcursor (1:1.1.14-1+deb9u2) stretch-security; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Fix a denial of service or potentially code execution via
+a one-byte heap overflow. (CVE-2015-9262) Closes: #906012)
+
+ -- Chris Lamb Mon, 13 Aug 2018 09:09:13 +0200
+
libxcursor (1:1.1.14-1+deb9u1) stretch-security; urgency=high
* Non-maintainer upload by the Security Team.
diff -u libxcursor-1.1.14/debian/patches/series
libxcursor-1.1.14/debian/patches/series
--- libxcursor-1.1.14/debian/patches/series
+++ libxcursor-1.1.14/debian/patches/series
@@ -1 +1,2 @@
+CVE-2015-9262.patch
Fix-heap-overflows-when-parsing-malicious-files.-CVE.patch
only in patch2:
unchanged:
--- libxcursor-1.1.14.orig/debian/patches/CVE-2015-9262.patch
+++ libxcursor-1.1.14/debian/patches/CVE-2015-9262.patch
@@ -0,0 +1,23 @@
+commit 897213f36baf6926daf6d192c709cf627aa5fd05
+Author: shubham shrivastav
+Date: Fri Jun 5 13:36:22 2015 -0700
+
+Insufficient memory for terminating null of string in _XcursorThemeInherits
+
+Fix does one byte of memory allocation for null termination of string.
+https://bugs.freedesktop.org/show_bug.cgi?id=90857
+
+Reviewed-by: Keith Packard
+Signed-off-by: Alan Coopersmith
+
+--- libxcursor-1.1.14.orig/src/library.c
libxcursor-1.1.14/src/library.c
+@@ -180,7 +180,7 @@ _XcursorThemeInherits (const char *full)
+ if (*l != '=') continue;
+ l++;
+ while (*l == ' ') l++;
+- result = malloc (strlen (l));
++ result = malloc (strlen (l) + 1);
+ if (result)
+ {
+ r = result;
Bug#906012: libxcursor: CVE-2015-9262
Package: libxcursor Version: 1:1.1.14-1+deb8u1 X-Debbugs-CC: t...@security.debian.org Severity: grave Tags: security Hi, The following vulnerability was published for libxcursor. CVE-2015-9262[0]: | _XcursorThemeInherits in library.c in libXcursor before 1.1.15 allows | remote attackers to cause denial of service or potentially code | execution via a one-byte heap overflow. If you fix the vulnerability please also make sure to include the CVE (Common Vulnerabilities & Exposures) id in your changelog entry. For further information see: [0] https://security-tracker.debian.org/tracker/CVE-2015-9262 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-9262 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Re: spirv-headers_0+git20180201.ce3092-1_amd64.changes is NEW
Hi Timo, > What's the status of this? It's a very simple package and is still > blocking further work on splitting src:vulkan. Simply was in the queue. I have processed it now (ACCEPTED with an RC bug.) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#899358: weston: please make the build reproducible
Source: weston Version: 3.0.0-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpaths X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0], we noticed that weston could not be built reproducibly. This is because it uses the build path in the final binary package (which is then broken anyway). Patch attached that uses @libexecdir@, which is where file lives at runtime. :) [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/weston.ini.in 2018-05-23 09:48:06.036427787 +0100 --- b/weston.ini.in 2018-05-23 09:59:25.581499358 +0100 @@ -38,7 +38,7 @@ [launcher] icon=/usr/share/icons/gnome/24x24/apps/arts.png -path=@abs_top_builddir@/weston-flower +path=@libexecdir@/weston-flower [input-method] path=@libexecdir@/weston-keyboard
Bug#897362: wayland: Incomplete debian/copyright?
Hi Jeremy, > This bug is blocking other packages (for instance, the webkit2gtk > security update for Testing and backports) and is probably not a new > issue so let's let wayland migrate. WFM, but naturally would be nice to see this addressed soonish :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#897362: wayland: Incomplete debian/copyright?
Source: wayland Version: 1.15.0-1 Severity: serious Justication: Policy 12.5 X-Debbugs-CC: Timo Aaltonen <tjaal...@debian.org> Hi, I just ACCEPTed wayland from NEW but noticed it was missing attribution in debian/copyright for at least Yong Bakos, Giulio Camuffo, Samsung, Marek Chalupa, etc. This is in no way exhaustive so please check over the entire package carefully and address these on your next upload. :) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Re: xorgproto_2018.4-2_amd64.changes REJECTED
> > Did you even bother to look at the *new* package? The dak interface does not make it immediately obvious that the aforementioend notes were written about a superceded version, so these things sometimes happen. Thank you for your patience and re-uploading, I hope it didn't cause too much delay for you. -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
xorgproto_2018.4-2_amd64.changes REJECTED
(I am "merely" forwarding note below; please add waldi@ in any replies) -- Chris Lamb <la...@debian.org> Wed, 21 Mar 2018 23:50:49 + Author: Bastian Blank Version: 2018.4-1 Timestamp: 2018-03-06 19:36:05.059079+00:00 REJECT Takes over more then ten packages but gives not the slightest hint that this is correct Uses a weird mix of package styles: W: xorgproto source: patch-system-but-direct-changes-in-diff attic/bigreqsproto/docbook.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/bigreqsproto/specs/Makefile.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/fontsproto/docbook.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/fontsproto/specs/Makefile.am === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
xorgproto_2018.4-1_amd64.changes REJECTED
Version: 2018.4-1 Timestamp: 2018-03-06 19:36:05.059079+00:00 Takes over more then ten packages but gives not the slightest hint that this is correct Uses a weird mix of package styles: W: xorgproto source: patch-system-but-direct-changes-in-diff attic/bigreqsproto/docbook.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/bigreqsproto/specs/Makefile.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/fontsproto/docbook.am W: xorgproto source: patch-system-but-direct-changes-in-diff attic/fontsproto/specs/Makefile.am (forwarding notes from wa...@debian.org above; please CC him on replies) -- Chris Lamb <la...@debian.org> Fri, 09 Mar 2018 05:56:46 + === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
Bug#833508: Fwd: Bug#833508: xbacklight reports "No outputs have backlight property"
[Dropping owner@ from CC] Dear Khurram, I'm sorry to hear you are having problems with Debian. I suggest you follow up with the X team; the Project Leader as a rule does not interfere with the technical details of bugs :) You can do this by writing to the bug number: 833...@bugs.debian.org I have CC'd this mail to there, so pressing "Reply All" should do the trick. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
weston_3.0.0-1_amd64.changes REJECTED
Hi, You seem to be missing a large number of attributions for (at least) Samsung, BMW, etc. Please check over your entire package (I stopped looking there). :) -- Chris Lamb <la...@debian.org> Thu, 10 Aug 2017 13:19:59 + === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
libglvnd_0.2.999+git20170201-3_amd64.changes REJECTED
Hi, Sorry I'm going to have to reject your package as it is missing references for LunarG, Inc,, Khronos Group, Vmware etc. I stopped looking there so please look over your entire package. :) -- Chris Lamb <la...@debian.org> Tue, 01 Aug 2017 11:48:37 + === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
libglvnd_0.2.999+git20170201-2_amd64.changes REJECTED
. === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
libglvnd_0.2.999+git20170201-1_amd64.changes REJECTED
. === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
Bug#868843: xorg-server: please make the BUILD_{DATE,TIME} reproducible
forwarded 868843 https://lists.x.org/pipermail/xorg-devel/2017-July/054127.html thanks Updating URL. Regards, -- ,''`. : :' : Chris Lamb, Debian Project Leader `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#868843: xorg-server: please make the BUILD_{DATE,TIME} reproducible
tags 868843 - moreinfo
forwarded 868843 https://lists.x.org/archives/xorg-devel/2017-July/thread.html
thanks
Hi Julien,
Thanks for the quick followup. :)
> How portable is the change to non-gnu date?
My previous patch was not. The updated attached patch is compatible
with BSD date(1). I am removing the "moreinfo" tag, assuming that was
why you added it.
> Can you send this patch upstream per
> https://www.x.org/wiki/Development/Documentation/SubmittingPatches/?
Done: https://lists.x.org/archives/xorg-devel/2017-July/thread.html
Best wishes,
--
,''`.
: :' : Chris Lamb, Debian Project Leader
`. `'` la...@debian.org / chris-lamb.co.uk
`-
From bb171c65af6ee0c8b48e9108b277b1f9ff21f978 Mon Sep 17 00:00:00 2001
From: Chris Lamb <ch...@chris-lamb.co.uk>
Date: Thu, 20 Jul 2017 15:42:15 +0100
Subject: [PATCH] configure.ac: Make BUILD_{DATE,TIME} respect
SOURCE_DATE_EPOCH if set
Whilst working on the Reproducible Builds effort [0], we noticed that
xorg-server could not be built reproducibly. One reason is because it
embeds a "current" build and date time.
This should be compatible with both GNU and BSD date(1).
[0] https://reproducible-builds.org/
---
configure.ac | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e202770c1..f10a94cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2405,9 +2405,15 @@ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [sysconfdir])
AC_SUBST([RELEASE_DATE])
-BUILD_DATE="`date +'%Y%m%d'`"
+DATE_FMT="%Y-%m-%d"
+TIME_FMT="1%H%M%S"
+BUILD_DATE="`date "+$DATE_FMT"`"
+BUILD_TIME="`date "+$TIME_FMT"`"
+if test "x$SOURCE_DATE_EPOCH" != "x"; then
+ BUILD_DATE="`date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u "+$DATE_FMT"`"
+ BUILD_TIME="`date -u -d "@$SOURCE_DATE_EPOCH" "+$TIME_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$TIME_FMT" 2>/dev/null || date -u "+$TIME_FMT"`"
+fi
AC_SUBST([BUILD_DATE])
-BUILD_TIME="`date +'1%H%M%S'`"
AC_SUBST([BUILD_TIME])
DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
--
2.13.3
Bug#868843: xorg-server: please make the BUILD_{DATE,TIME} reproducible
Source: xorg-server Version: 2:1.19.3-2 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org Hi, Whilst working on the Reproducible Builds effort [0], we noticed that xorg-server could not be built reproducibly. One reason is because it embeds a build and date time. Patch attached. Thanks to Bernhard M. Wiedemann! [0] https://reproducible-builds.org/ Regards, -- ,''`. : :' : Chris Lamb, Debian Project Leader `. `'` la...@debian.org / chris-lamb.co.uk `- diff --git a/configure.ac b/configure.ac index e6c5b35..cd7ebfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2555,9 +2555,14 @@ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [sysconfdir]) AC_SUBST([RELEASE_DATE]) -BUILD_DATE="`date +'%Y%m%d'`" +if test "x$SOURCE_DATE_EPOCH" = "x"; then + BUILD_DATE="`date --utc --date="@$SOURCE_DATE_EPOCH" +'%Y%m%d'`" + BUILD_TIME="`date --utc --date="@$SOURCE_DATE_EPOCH" +'1%H%M%S'`" +else + BUILD_DATE="`date +'%Y%m%d'`" + BUILD_TIME="`date +'1%H%M%S'`" +fi AC_SUBST([BUILD_DATE]) -BUILD_TIME="`date +'1%H%M%S'`" AC_SUBST([BUILD_TIME]) DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
Wheezy update of xorg-server?
Dear maintainer(s), The Debian LTS team would like to fix the security issues which are currently open in the Wheezy version of xorg-server: https://security-tracker.debian.org/tracker/source-package/xorg-server Would you like to take care of this yourself? If yes, please follow the workflow we have defined here: https://wiki.debian.org/LTS/Development If that workflow is a burden to you, feel free to just prepare an updated source package and send it to debian-...@lists.debian.org (via a debdiff, or with an URL pointing to the source package, or even with a pointer to your packaging repository), and the members of the LTS team will take care of the rest. Indicate clearly whether you have tested the updated package or not. If you don't want to take care of this update, it's not a problem, we will do our best with your package. Just let us know whether you would like to review and/or test the updated package before it gets released. You can also opt-out from receiving future similar emails in your answer and then the LTS Team will take care of xorg-server updates for the LTS releases. Thank you very much. Chris Lamb, on behalf of the Debian LTS team. PS: A member of the LTS team might start working on this update at any point in time. You can verify whether someone is registered on this update in this file: https://anonscm.debian.org/viewvc/secure-testing/data/dla-needed.txt?view=markup Regards, -- ,''`. : :' : Chris Lamb, Debian Project Leader `. `'` la...@debian.org / chris-lamb.co.uk `-
libdrm_2.4.74-2_amd64.changes REJECTED
Mon 30 23:05 < pochu> please reject libdrm from NEW, it was meant for experimental === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
libxfont_2.0.1-1_amd64.changes REJECTED
as requested === Please feel free to respond to this email if you don't understand why your files were rejected, or if you upload new files which address our concerns.
Bug#831405: xserver-xorg-video-openchrome: please make the build reproducible
Dear Maintainer, > Source: xserver-xorg-video-openchrome > Version: 1:0.2.904+svn842-2+squeeze1 > Tags: patch There hasn't seem to be any update on this bug in 61 days, in which time the Reproducible Builds effort has come on a long way. :) Would you consider applying this patch and uploading? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
Bug#831405: xserver-xorg-video-openchrome: please make the build reproducible
Source: xserver-xorg-video-openchrome Version: 1:0.3.3+git20160310-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: timestamps X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org Hi, Whilst working on the "reproducible builds" effort [0], we noticed that xserver-xorg-video-openchrome could not be built reproducibly. Patch attached. Please send it upstream if possible. [0] https://wiki.debian.org/ReproducibleBuilds Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- --- a/src/Makefile.am 2016-07-15 17:56:15.066700891 +0200 --- b/src/Makefile.am 2016-07-15 18:22:08.362042386 +0200 @@ -113,6 +113,9 @@ if [ -d .svn ]; then \ echo '#define BUILDCOMMENT "(development build, at revision '\ "`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > $@.tmp; \ +elif [ "$$SOURCE_DATE_EPOCH" ]; then \ + printf '#define BUILDCOMMENT "(compiled with SOURCE_DATE_EPOCH: %s)"' $$SOURCE_DATE_EPOCH \ + > $@.tmp; \ else \ date +'#define BUILDCOMMENT "(development build, compiled on %c)"' \ > $@.tmp; \
Comments regarding vulkan_1.0.8.0+dfsg1-1_amd64.changes
Next upload please split out some code copies in debian/copyright (at least loader/cJSON.[ch]), loader/murmurhash.c, etc. Also you are missing the Android, Chromium references (and others; incomplete list).
Bug#815867: libxkbcommon: FTBFS: FAIL: test/x11comp
Source: libxkbcommon Version: 0.5.0-1 Severity: serious Justification: fails to build from source User: reproducible-bui...@lists.alioth.debian.org Usertags: ftbfs X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org Dear Maintainer, libxkbcommon fails to build from source in unstable/amd64: [..] make[3]: Leaving directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' make check-TESTS make[3]: Entering directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' make[4]: Entering directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' PASS: test/context PASS: test/utf8 PASS: test/rules-file PASS: test/log PASS: test/atom PASS: test/keysym PASS: test/state PASS: test/filecomp PASS: test/buffercomp PASS: test/stringcomp PASS: test/compose PASS: test/rulescomp PASS: test/keyseq SKIP: test/x11 FAIL: test/x11comp Testsuite summary for libxkbcommon 0.5.0 # TOTAL: 15 # PASS: 13 # SKIP: 1 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 See ./test-suite.log Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon Makefile:1687: recipe for target 'test-suite.log' failed make[4]: *** [test-suite.log] Error 1 make[4]: Leaving directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' Makefile:1793: recipe for target 'check-TESTS' failed make[3]: *** [check-TESTS] Error 2 make[3]: Leaving directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' Makefile:2102: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' Makefile:2105: recipe for target 'check' failed make[1]: *** [check] Error 2 make[1]: Leaving directory '/home/lamby/temp/cdt.20160225074617.SVmbtSnzXS/libxkbcommon-0.5.0' dh_auto_test: make -j9 check returned exit code 2 debian/rules:17: recipe for target 'build' failed make: *** [build] Error 2 [..] The full build log is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- libxkbcommon.0.5.0-1.unstable.amd64.log.txt.gz Description: Binary data
Bug#813359: xserver-xorg-input-aiptek: FTBFS: xf86Aiptek.c:296:17: error: too many arguments to function 'xf86PostKeyEvent'
ment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] s = xf86FindOptionValue(pInfo->options, "Type"); ^ ../../src/xf86Aiptek.c:1861:24: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] common->deviceName = xf86FindOptionValue(pInfo->options, "Device"); ^ ../../src/xf86Aiptek.c:1936:7: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] s = xf86FindOptionValue(pInfo->options, "Pressure"); ^ ../../src/xf86Aiptek.c:1956:7: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] s = xf86FindOptionValue(pInfo->options, "Mode"); ^ Makefile:457: recipe for target 'xf86Aiptek.lo' failed make[3]: *** [xf86Aiptek.lo] Error 1 make[3]: Leaving directory '/home/lamby/temp/cdt.20160201084729.aY0PW5Ttii/xserver-xorg-input-aiptek-1.4.1/build/src' Makefile:438: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/home/lamby/temp/cdt.20160201084729.aY0PW5Ttii/xserver-xorg-input-aiptek-1.4.1/build' Makefile:370: recipe for target 'all' failed make[1]: *** [all] Error 2 make[1]: Leaving directory '/home/lamby/temp/cdt.20160201084729.aY0PW5Ttii/xserver-xorg-input-aiptek-1.4.1/build' dh_auto_build: make -j1 returned exit code 2 debian/rules:17: recipe for target 'build' failed make: *** [build] Error 2 [..] The full build log is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- xserver-xorg-input-aiptek.1:1.4.1-1.unstable.amd64.log.txt.gz Description: Binary data
Bug#812882: xserver-xorg-video-intel: FTBFS: src/uxa/intel_driver.c:645:2: error: too many arguments to function 'PixmapSyncDirtyHelper'
Source: xserver-xorg-video-intel Version: 2:2.99.917-2 Severity: serious Justification: fails to build from source User: reproducible-bui...@lists.alioth.debian.org Usertags: ftbfs X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org Dear Maintainer, xserver-xorg-video-intel fails to build from source in unstable/amd64: [..] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../../src/uxa -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -fvisibility=hidden -I/usr/include/libdrm -I/usr/include/pixman-1 -I/usr/include/xorg -I/usr/include/X11/dri -I/usr/include/libdrm -I/usr/include/libdrm -I/usr/include/libdrm -I../../../xvmc -I../../../src -I../../../src/render_program -I../../../xvmc -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c ../../../src/uxa/intel_driver.c -fPIC -DPIC -o .libs/intel_driver.o ../../../src/uxa/intel_driver.c: In function 'redisplay_dirty': ../../../src/uxa/intel_driver.c:645:2: error: too many arguments to function 'PixmapSyncDirtyHelper' PixmapSyncDirtyHelper(dirty, ); ^ In file included from /usr/include/xorg/gc.h:54:0, from /usr/include/xorg/dix.h:51, from /usr/include/xorg/privates.h:151, from /usr/include/xorg/cursor.h:53, from /usr/include/xorg/scrnintstr.h:53, from /usr/include/xorg/xf86str.h:39, from /usr/include/xorg/xf86.h:44, from ../../../src/uxa/intel_driver.c:49: /usr/include/xorg/pixmap.h:131:1: note: declared here PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty); ^ Makefile:538: recipe for target 'intel_driver.lo' failed make[4]: *** [intel_driver.lo] Error 1 make[4]: Leaving directory '/home/lamby/temp/cdt.20160127152723.J5ezd6xJap/xserver-xorg-video-intel-2.99.917/build/src/uxa' Makefile:608: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory '/home/lamby/temp/cdt.20160127152723.J5ezd6xJap/xserver-xorg-video-intel-2.99.917/build/src' Makefile:478: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/home/lamby/temp/cdt.20160127152723.J5ezd6xJap/xserver-xorg-video-intel-2.99.917/build' Makefile:410: recipe for target 'all' failed make[1]: *** [all] Error 2 make[1]: Leaving directory '/home/lamby/temp/cdt.20160127152723.J5ezd6xJap/xserver-xorg-video-intel-2.99.917/build' dh_auto_build: make -j1 returned exit code 2 debian/rules:51: recipe for target 'build' failed make: *** [build] Error 2 [..] The full build log is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- xserver-xorg-video-intel.2:2.99.917-2.unstable.amd64.log.txt.gz Description: Binary data
Bug#807705: xserver-xorg-video-openchrome: FTBFS: /usr/include/xorg/os.h:558:1: error: expected identifier or '(' before '__extension__'
Source: xserver-xorg-video-openchrome
Version: 1:0.3.3-1
Severity: serious
Justification: fails to build from source
User: reproducible-bui...@lists.alioth.debian.org
Usertags: ftbfs
X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org
Dear Maintainer,
xserver-xorg-video-openchrome fails to build from source in unstable/amd64:
[..]
make[5]: Entering directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build/src'
/bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I.
-I../../src -I.. -fvisibility=hidden -I/usr/include/pixman-1
-I/usr/include/libdrm -I/usr/include/xorg -I/usr/include/X11/dri
-fvisibility=hidden -I/usr/include/pixman-1 -I/usr/include/libdrm
-I/usr/include/xorg -I/usr/include/X11/dri -I/usr/include/libdrm
-I/usr/include/X11/dri -g -O2 -c -o via_3d.lo ../../src/via_3d.c
libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../src -I..
-fvisibility=hidden -I/usr/include/pixman-1 -I/usr/include/libdrm
-I/usr/include/xorg -I/usr/include/X11/dri -fvisibility=hidden
-I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/xorg
-I/usr/include/X11/dri -I/usr/include/libdrm -I/usr/include/X11/dri -g -O2 -c
../../src/via_3d.c -fPIC -DPIC -o .libs/via_3d.o
In file included from /usr/include/string.h:634:0,
from /usr/include/xorg/os.h:53,
from /usr/include/xorg/misc.h:115,
from /usr/include/xorg/xf86str.h:37,
from /usr/include/xorg/xf86.h:44,
from ../../src/via_3d.h:27,
from ../../src/via_3d.c:24:
/usr/include/xorg/os.h:558:1: error: expected identifier or '(' before
'__extension__'
strndup(const char *str, size_t n);
^
Makefile:596: recipe for target 'via_3d.lo' failed
make[5]: *** [via_3d.lo] Error 1
make[5]: Leaving directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build/src'
Makefile:611: recipe for target 'all-recursive' failed
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build/src'
Makefile:475: recipe for target 'all' failed
make[3]: *** [all] Error 2
make[3]: Leaving directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build/src'
Makefile:445: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build'
Makefile:377: recipe for target 'all' failed
make[1]: *** [all] Error 2
make[1]: Leaving directory
'/home/lamby/temp/cdt.20151211222417.E2Yo35PxGF/xserver-xorg-video-openchrome-0.3.3/build'
dh_auto_build: make -j1 returned exit code 2
debian/rules:34: recipe for target 'build' failed
make: *** [build] Error 2
[..]
The full build log is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
xserver-xorg-video-openchrome.1:0.3.3-1.unstable.amd64.log.txt.gz
Description: Binary data
Bug#803382: xserver-xorg-video-qxl: Missing Build-Depends on libglib2.0-dev and libssl-dev
Source: xserver-xorg-video-qxl Version: 0.1.4-3 Severity: serious Justification: fails to build from source User: reproducible-bui...@lists.alioth.debian.org Usertags: ftbfs X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org Tags: patch Dear Maintainer, xserver-xorg-video-qxl fails to build from source in unstable/amd64 due to missing Build-Depends on libglib2.0-dev and libssl-dev. The full build log is attached or (an alternate build) can be viewed here: https://reproducible.debian.net/logs/unstable/amd64/xserver-xorg-video-qxl_0.1.4-3.build1.log.gz Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- xserver-xorg-video-qxl.0.1.4-3.unstable.amd64.log.txt.gz Description: application/gzip
Bug#796373: mesa-demos: FTBFS: error: 'EGL_SCREEN_BIT_MESA' undeclared (first use in this function)
Source: mesa-demos Version: 8.2.0-1 Severity: serious Justification: fails to build from source User: reproducible-bui...@lists.alioth.debian.org Usertags: ftbfs X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org Dear Maintainer, mesa-demos fails to build from source in testing/amd64: [..] Making all in egl make[3]: Entering directory '/tmp/buildd/mesa-demos-8.2.0/src/egl' Making all in eglut make[4]: Entering directory '/tmp/buildd/mesa-demos-8.2.0/src/egl/eglut' /bin/bash ../../../libtool --tag=CC --mode=compile gcc -DPACKAGE_NAME=\mesa-demos\ -DPACKAGE_TARNAME=\mesa-demos\ -DPACKAGE_VERSION=\8.2.0\ -DPACKAGE_STRING=\mesa-demos\ 8.2.0\ -DPACKAGE_BUGREPORT=\https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\component=Demos\; -DPACKAGE_URL=\\ -DPACKAGE=\mesa-demos\ -DVERSION=\8.2.0\ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\.libs/\ -DDEMOS_DATA_DIR=\../data/\ -DDEMOS_DATA_DIR=\../data/\ -I. -Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include/libdrm -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c -o eglut.lo eglut.c libtool: compile: gcc -DPACKAGE_NAME=\mesa-demos\ -DPACKAGE_TARNAME=\mesa-demos\ -DPACKAGE_VERSION=\8.2.0\ -DPACKAGE_STRING=\mesa-demos 8.2.0\ -DPACKAGE_BUGREPORT=\https://bugs.freedesktop.org/enter_bug.cgi?product=Mesacomponent=Demos\; -DPACKAGE_URL=\\ -DPACKAGE=\mesa-demos\ -DVERSION=\8.2.0\ -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\.libs/\ -DDEMOS_DATA_DIR=\../data/\ -DDEMOS_DATA_DIR=\../data/\ -I. -Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include/libdrm -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -c eglut.c -fPIC -DPIC -o .libs/eglut.o eglut.c: In function '_eglutDestroyWindow': eglut.c:80:32: error: 'EGL_SCREEN_BIT_MESA' undeclared (first use in this function) _eglut-surface_type != EGL_SCREEN_BIT_MESA) ^ eglut.c:80:32: note: each undeclared identifier is reported only once for each function it appears in eglut.c: In function '_eglutCreateWindow': eglut.c:178:9: error: 'EGL_SCREEN_BIT_MESA' undeclared (first use in this function) case EGL_SCREEN_BIT_MESA: ^ eglut.c: In function 'eglutDestroyWindow': eglut.c:293:33: error: 'EGL_SCREEN_BIT_MESA' undeclared (first use in this function) if ( _eglut-surface_type != EGL_SCREEN_BIT_MESA) ^ Makefile:488: recipe for target 'eglut.lo' failed make[4]: *** [eglut.lo] Error 1 make[4]: Leaving directory '/tmp/buildd/mesa-demos-8.2.0/src/egl/eglut' Makefile:418: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory '/tmp/buildd/mesa-demos-8.2.0/src/egl' Makefile:434: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/tmp/buildd/mesa-demos-8.2.0/src' Makefile:441: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/tmp/buildd/mesa-demos-8.2.0' dh_auto_build: make -j1 returned exit code 2 debian/rules:3: recipe for target 'build' failed make: *** [build] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 [..] The full build log is attached or can be viewed here: https://reproducible.debian.net/logs/testing/amd64/mesa-demos_8.2.0-1.build1.log.gz Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- I: using fakeroot in build. I: pbuilder: network access will be disabled during build I: Current time: Sat Aug 15 13:11:14 GMT+12 2015 I: pbuilder-time-stamp: 1439687474 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/testing-reproducible-base.tgz] I: creating local configuration I: copying local configuration I: mounting /proc filesystem I: mounting /run/shm filesystem I: mounting /dev/pts filesystem I: Mounting /dev/shm I: Mounting /sys I: policy-rc.d already exists I: Installing the build-deps - Attempting to satisfy build-dependencies - Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: amd64 Maintainer: Debian Pbuilder Team pbuilder-ma...@lists.alioth.debian.org Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: debhelper (= 9), quilt, pkg-config, autoconf, automake, dh-autoreconf, libx11-dev, libxext-dev
Re: Nouveau kernel driver
Ben Hutchings wrote: I'd like to pull nouveau from 2.6.33 into Debian's 2.6.32. I'm hoping this would allow for replacement of nv and its dodgy source with nouveau This sounds like a good idea, but I should probably point out that I don't think we will be able to replace nv in squeeze with nouveau. Would this this affect whether you want to spend time on it now? As you imply, we get this for free by waiting for .33, and I will have to get some -snapshot packages into testing anyway.. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#536579: drm-modules-source: Fails to build with kernel 2.6.30
Denis Krivosheev wrote: [M] /usr/src/modules/drm-modules/linux-core/nouveau_drv.o CC [M] /usr/src/modules/drm-modules/linux-core/nouveau_state.o CC [M] /usr/src/modules/drm-modules/linux-core/nouveau_fifo.o CC Huh. It's not even trying to build the nouveau stuff here (a bug in itself) so I'm curious why it's attempting to do it for you. I think that's related to DRM_MODULES in linux-core/Makefile not including nouveau anymore. (The FTBFS is almost certainly fixed upstream.) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#536579: drm-modules-source: Fails to build with kernel 2.6.30
Chris Lamb wrote: (The FTBFS is almost certainly fixed upstream.) Actually, it's not - I'm behind on reading the Nouveau list: http://lists.freedesktop.org/archives/nouveau/2009-June/003134.html .. which means that drm-snapshot cannot build nouveau stuff anymore. It might be possible to temporarily fix it: http://lists.freedesktop.org/archives/nouveau/2009-June/003111.html but that solution is unlikely to work for any useful length of time. Any ideas, Julien? Anyway - Denis, regarding your issue (and this bug) - looking at the code it really shouldn't be trying to build the nouveau stuff anymore. Have you tried cleaning out any existing module assistant cruft with m-a clean drm and rebuilding? Also check you aren't exporting DRM_MODULES. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#536579: drm-modules-source: Fails to build with kernel 2.6.30
retitle 536579 Does not build nouveau.ko anymore severity 536579 important thanks Also check you aren't exporting DRM_MODULES. Command line was: DRM_MODULES=nouveau m-a auto-install drm. Because I need nouveau.ko module. Yeah, it would have been nice to see that little detail in the bug report, particularly after I mentioned that upstream aren't building that anymore... Anyway, see my last mail - in particular, the links to the Nouveau mailing list. This basically means Nouveau is not going to work in Debian until we work out what to do with the second DRM. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#535772: Fixed upstream
reassign 535772 xserver-xorg-video-intel thanks koos vriezen wrote: (my first guess, but who cares, is http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=cdbf84f20295c8a78624318aa6fdfff3f5c8ce27 Good spot. Reassigning to xserver-xorg-video-intel.. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
xserver-xorg-video-nouveau: Changes to 'debian-experimental'
debian/changelog | 57 debian/control|4 src/Makefile.am |2 src/drmmode_display.c | 158 +++--- src/nouveau_bios.h|2 src/nouveau_dri2.c|3 src/nouveau_exa.c | 183 +-- src/nouveau_hw.c | 72 +-- src/nouveau_hw.h |4 src/nouveau_local.h | 12 -- src/nouveau_ms.h | 156 ++ src/nouveau_wfb.c | 193 ++ src/nouveau_xv.c | 23 ++--- src/nv30_exa.c|5 - src/nv30_xv_tex.c |6 - src/nv40_exa.c|5 - src/nv40_xv_tex.c |6 - src/nv50_exa.c|6 - src/nv50_randr.c |4 src/nv50_xv.c | 10 +- src/nv_bios.c | 124 --- src/nv_const.h|2 src/nv_crtc.c | 99 ++--- src/nv_cursor.c | 22 ++-- src/nv_dri.c |2 src/nv_driver.c | 229 ++ src/nv_output.c | 124 ++- src/nv_proto.h| 16 ++- src/nv_setup.c| 64 ++--- src/nv_type.h | 113 +--- 30 files changed, 1037 insertions(+), 669 deletions(-) New commits: commit dce88a3d787398667baf015182fd5aaf245baed9 Author: Chris Lamb la...@debian.org Date: Sat Jul 4 21:00:45 2009 +0100 releasing version 1:0.0.10~git+20090701+c0bf670-1 diff --git a/debian/changelog b/debian/changelog index f4353d2..988a794 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) UNRELEASED; urgency=low +xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) experimental; urgency=low * New upstream snapshot. - c0bf670... wfb: fix stupid thinko + more safety @@ -53,7 +53,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) UNRELEASED; urgency * Bump Build-Depends on libdrm-dev. * Bump Standards-Version to 3.8.2. - -- Chris Lamb la...@debian.org Wed, 01 Jul 2009 00:24:20 +0100 + -- Chris Lamb la...@debian.org Sat, 04 Jul 2009 21:00:34 +0100 xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) experimental; urgency=low commit ef6bdabeb83c1f131df20a546c4dcc35074b7576 Author: Chris Lamb la...@debian.org Date: Wed Jul 1 00:27:33 2009 +0100 Bump Standards-Version to 3.8.2. diff --git a/debian/changelog b/debian/changelog index f7155fa..f4353d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) UNRELEASED; urgency - db9ff95... kms: clip sw transition dims to smallest common area - 2688c97... don't run vbios parser when kms enabled * Bump Build-Depends on libdrm-dev. + * Bump Standards-Version to 3.8.2. -- Chris Lamb la...@debian.org Wed, 01 Jul 2009 00:24:20 +0100 diff --git a/debian/control b/debian/control index b920475..5b996c4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Chris Lamb la...@debian.org, Matthew Johnson mj...@debian.org 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.11+git+20090630), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, automake, libtool, xutils-dev, xserver-xorg-dev -Standards-Version: 3.8.1 +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 Vcs-Browser: http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau.git commit f4e28e937aeaf62a0929f70a45d03e122cc6cdec Author: Chris Lamb la...@debian.org Date: Wed Jul 1 00:27:17 2009 +0100 Bump Build-Depends on libdrm-dev. diff --git a/debian/changelog b/debian/changelog index 89b600b..f7155fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) UNRELEASED; urgency - 6c09ad5... Tolerate missing fp bios table (rh#502371) - db9ff95... kms: clip sw transition dims to smallest common area - 2688c97... don't run vbios parser when kms enabled + * Bump Build-Depends on libdrm-dev. -- Chris Lamb la...@debian.org Wed, 01 Jul 2009 00:24:20 +0100 diff --git a/debian/control b/debian/control index d8361dd..b920475 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Chris Lamb la...@debian.org, Matthew Johnson mj...@debian.org -Build-Depends: debhelper (= 7), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-video-dev
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
src/Makefile.am |2
src/drmmode_display.c | 158 +++---
src/nouveau_bios.h|2
src/nouveau_dri2.c|3
src/nouveau_exa.c | 183 +--
src/nouveau_hw.c | 72 +--
src/nouveau_hw.h |4
src/nouveau_local.h | 12 --
src/nouveau_ms.h | 156 ++
src/nouveau_wfb.c | 193 ++
src/nouveau_xv.c | 23 ++---
src/nv30_exa.c|5 -
src/nv30_xv_tex.c |6 -
src/nv40_exa.c|5 -
src/nv40_xv_tex.c |6 -
src/nv50_exa.c|6 -
src/nv50_randr.c |4
src/nv50_xv.c | 10 +-
src/nv_bios.c | 124 ---
src/nv_const.h|2
src/nv_crtc.c | 99 ++---
src/nv_cursor.c | 22 ++--
src/nv_dri.c |2
src/nv_driver.c | 229 ++
src/nv_output.c | 124 ++-
src/nv_proto.h| 16 ++-
src/nv_setup.c| 64 ++---
src/nv_type.h | 113 +---
28 files changed, 978 insertions(+), 667 deletions(-)
New commits:
commit c0bf670ac6b58cff60a01ab6b174ece6b1b7d892
Author: Ben Skeggs bske...@redhat.com
Date: Thu Jun 25 07:26:54 2009 +1000
wfb: fix stupid thinko + more safety
diff --git a/src/nouveau_wfb.c b/src/nouveau_wfb.c
index 7c60ed1..ae5f3af 100644
--- a/src/nouveau_wfb.c
+++ b/src/nouveau_wfb.c
@@ -125,7 +125,7 @@ void
nouveau_wfb_setup_wrap(ReadMemoryProcPtr *pRead, WriteMemoryProcPtr *pWrite,
DrawablePtr pDraw)
{
- struct nouveau_pixmap *nvpix;
+ struct nouveau_pixmap *nvpix = NULL;
struct wfb_pixmap *wfb;
PixmapPtr ppix = NULL;
int wrap, have_tiled = 0;
@@ -175,7 +175,6 @@ nouveau_wfb_setup_wrap(ReadMemoryProcPtr *pRead,
WriteMemoryProcPtr *pWrite,
void
nouveau_wfb_finish_wrap(DrawablePtr pDraw)
{
- struct wfb_pixmap *wfb = wfb_pixmap[0];
PixmapPtr ppix;
int i;
@@ -184,11 +183,11 @@ nouveau_wfb_finish_wrap(DrawablePtr pDraw)
return;
for (i = 0; i 6; i++) {
- if (wfb-ppix != ppix)
- continue;
-
- wfb-ppix = NULL;
- break;
+ if (wfb_pixmap[i].ppix == ppix) {
+ wfb_pixmap[i].ppix = NULL;
+ wfb_pixmap[i].base = ~0UL;
+ break;
+ }
}
}
commit a12cb5c8c0a85a601188178c5fc0d84a13abd87e
Author: Ben Skeggs bske...@redhat.com
Date: Thu Jun 18 14:28:25 2009 +1000
bios: oops
diff --git a/src/nv_bios.c b/src/nv_bios.c
index b307fc6..5578928 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -197,13 +197,15 @@ struct methods {
static struct methods nv04_methods[] = {
{ PROM, load_vbios_prom, false },
{ PRAMIN, load_vbios_pramin, true },
- { PCI ROM, load_vbios_pci, true }
+ { PCI ROM, load_vbios_pci, true },
+ { }
};
static struct methods nv50_methods[] = {
{ PRAMIN, load_vbios_pramin, true },
{ PROM, load_vbios_prom, false },
- { PCI ROM, load_vbios_pci, true }
+ { PCI ROM, load_vbios_pci, true },
+ { }
};
static bool NVShadowVBIOS(ScrnInfoPtr pScrn, uint8_t *data)
commit e66867e4cf9f0bc8a1971664ccc3d5c56b08b2fb
Author: Ben Skeggs bske...@redhat.com
Date: Tue Jun 16 10:28:00 2009 +1000
bios: use image from PRAMIN in preference to PROM on NV50
There's at least one known case (rh#492658) where the DCB table present in
the VBIOS image from PROM is not suitable for use. It contained all 16
entries filled, each entry valid in itself, but contradicting other entries.
The VBIOS image in PRAMIN however, still has all 16 entries filled, but the
first few entries now match what is present on the hardware, and the rest
are set as type 0xf, which we ignore.
diff --git a/src/nv_bios.c b/src/nv_bios.c
index 865b22d..b307fc6 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -187,42 +187,62 @@ static void load_vbios_pci(NVPtr pNv, uint8_t *data)
#endif
}
+struct methods {
+ const char desc[8];
+ void (*loadbios)(NVPtr, uint8_t *);
+ const bool rw;
+ int score;
+};
+
+static struct methods nv04_methods[] = {
+ { PROM, load_vbios_prom, false },
+ { PRAMIN, load_vbios_pramin, true },
+ { PCI ROM, load_vbios_pci, true }
+};
+
+static struct methods nv50_methods[] = {
+ { PRAMIN, load_vbios_pramin, true },
+ { PROM, load_vbios_prom, false },
+ { PCI ROM, load_vbios_pci, true }
+};
+
static bool NVShadowVBIOS(ScrnInfoPtr pScrn, uint8_t *data)
{
NVPtr pNv = NVPTR(pScrn);
- struct methods {
- const char desc[8];
- void (*loadbios)(NVPtr, uint8_t *);
-
xserver-xorg-video-nouveau: Changes to 'refs/tags/xserver-xorg-video-nouveau-0.0.10-git+20090701+c0bf670-1'
Tag 'xserver-xorg-video-nouveau-0.0.10-git+20090701+c0bf670-1' created by Chris Lamb la...@debian.org at 2009-07-04 20:09 + xserver-xorg-video-nouveau (1:0.0.10~git+20090701+c0bf670-1) experimental; urgency=low Changes since debian/0.0.10-git+20090519+9656762-1: Adam Jackson (1): Remove useless loader symbol lists. Ben Skeggs (28): don't run vbios parser when kms enabled kms: clip sw transition dims to smallest common area explicitly mark buffers mappable exa: fix compile against latest libdrm_nouveau nv50: use tile_mode from bo nv50: use non-linear scanout buffer when driver pixmaps enabled exa: create unacceleratable pixmaps (ie. 1bpp) in system memory nv50: make use of larger tile sizes exa: wait_marker becomes a NOP with driver pixmaps xv: fix some issues with driver pixmaps exa: use the sane CreatePixmap hook, if available nv50: use libwfb for pixmap access when driver pixmaps enabled fix some pitch issues wfb: need a 64-bit datatype for multiply_factor wfb: work-around wfb suckage wfb: mode0 tiles have the same pitch as the others nv50: sigh nv50: create non-linear scanout buffers for rotation kms: point rotation pixmap at correct buffer kms: fix rotation buffer pitch kms: small cleanup wfb: be more cautious in a few places wfb: use straight memcpy hook if no tiled wraps present kms: safer fb resize func wrap BlockHandler a little earlier bios: use image from PRAMIN in preference to PROM on NV50 bios: oops wfb: fix stupid thinko + more safety Chris Lamb (6): Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot. Add long changelog. Bump Build-Depends on libdrm-dev. Bump Standards-Version to 3.8.2. releasing version 1:0.0.10~git+20090701+c0bf670-1 Stuart Bennett (13): Tolerate missing fp bios table (rh#502371) randr12: fix two colour cursor on second head Fix oopsy from 81bbdd4e causing broken framebuffer randr12: a bunch of trivial improvements and tidyups Simplify tests for digital fp outputs randr12: line length improvements randr12: better behaviour (avoid crash) when fp native mode can't be found randr12: disable lvds (invalidate all modes) if bios lvds parsing fails Remove TMDS table script pointers not stubbed bios warning randr12: improve uniformity of props code Move head getting into nouveau_hw.c randr12: split from pre-randr12 structs into new header, de-typedef Add DVI-A output info for Mac card missing bios tables (#21273) --- debian/changelog | 57 debian/control|4 src/Makefile.am |2 src/drmmode_display.c | 158 +++--- src/nouveau_bios.h|2 src/nouveau_dri2.c|3 src/nouveau_exa.c | 183 +-- src/nouveau_hw.c | 72 +-- src/nouveau_hw.h |4 src/nouveau_local.h | 12 -- src/nouveau_ms.h | 156 ++ src/nouveau_wfb.c | 193 ++ src/nouveau_xv.c | 23 ++--- src/nv30_exa.c|5 - src/nv30_xv_tex.c |6 - src/nv40_exa.c|5 - src/nv40_xv_tex.c |6 - src/nv50_exa.c|6 - src/nv50_randr.c |4 src/nv50_xv.c | 10 +- src/nv_bios.c | 124 --- src/nv_const.h|2 src/nv_crtc.c | 99 ++--- src/nv_cursor.c | 22 ++-- src/nv_dri.c |2 src/nv_driver.c | 229 ++ src/nv_output.c | 124 ++- src/nv_proto.h| 16 ++- src/nv_setup.c| 64 ++--- src/nv_type.h | 113 +--- 30 files changed, 1037 insertions(+), 669 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#535772: intel:crash in drm_intel_gem_bo_unreference_locked
Hi koos, After startx, the server starts, shows the KDE4 animated mouse and then crashes. [..] but same crash happened with everything from unstable. Firstly, can you check #535300 to see whether this is a duplicate. Secondly, please *always* file X bugs with reportbug so we get all the right info - without this stuff, reporting the bug is pretty much a waste of everyones time. Thanks for understanding. A traceback of the crash would also be nice (if this isn't a dup of the above). Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#535772: intel:crash in drm_intel_gem_bo_unreference_locked
koos vriezen wrote: Actually I followed http://wiki.debian.org/XStrikeForce/XserverDebugging gdb.txt and output from bash -c /usr/share/bug/xserver-xorg-core/script 31 file are attached. Sorry - I did not see the attachments. Please accept my apologies. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#535063: drm-modules-source: Fails to build with kernel 2.6.30
tags 535063 + pending thanks Hi Adrian, Severity: normal Why not serious? :) JFTR: drm-modules-source fails to build on 2.6.30: Thanks for the report - I've built a newer snapshot and it builds fine against 2.6.30. I'll test it on suitable hardware tonight and upload (~8h). Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'upstream-experimental'
configure.ac|9
libdrm/Makefile.am |6
libdrm/nouveau/libdrm_nouveau.pc.in |2
libdrm/nouveau/nouveau_bo.c | 187 +-
libdrm/nouveau/nouveau_bo.h | 22
libdrm/nouveau/nouveau_device.c |6
libdrm/nouveau/nouveau_device.h |2
libdrm/nouveau/nouveau_drmif.h |3
libdrm/nouveau/nouveau_private.h|1
libdrm/nouveau/nouveau_pushbuf.c|4
libdrm/nouveau/nouveau_pushbuf.h| 23
libdrm/radeon/Makefile.am | 53
libdrm/radeon/libdrm_radeon.pc.in | 10
libdrm/radeon/radeon_bo.h | 179 ++
libdrm/radeon/radeon_bo_gem.c | 254 +++
libdrm/radeon/radeon_bo_gem.h | 42
libdrm/radeon/radeon_cs.h | 208 ++
libdrm/radeon/radeon_cs_gem.c | 551 +++
libdrm/radeon/radeon_cs_gem.h | 41
libdrm/radeon/radeon_track.c| 140 +
libdrm/radeon/radeon_track.h| 64
linux-core/Makefile |2
linux-core/Makefile.kernel |7
linux-core/drmP.h | 21
linux-core/drm_agpsupport.c | 171 --
linux-core/drm_bo.c | 2730
linux-core/drm_bo_lock.c| 189 --
linux-core/drm_bo_move.c| 614
linux-core/drm_compat.c | 99 -
linux-core/drm_drv.c| 36
linux-core/drm_fence.c | 829 --
linux-core/drm_fops.c | 35
linux-core/drm_object.c | 294 ---
linux-core/drm_objects.h| 821 --
linux-core/drm_os_linux.h |8
linux-core/drm_proc.c | 102 -
linux-core/drm_stub.c | 14
linux-core/drm_sysfs.c |8
linux-core/drm_ttm.c| 512 --
linux-core/drm_vm.c | 198 --
linux-core/nouveau_backlight.c | 93 +
linux-core/via_buffer.c | 163 --
linux-core/via_fence.c | 169 --
linux-core/xgi_cmdlist.c|3
linux-core/xgi_drv.c| 11
linux-core/xgi_drv.h| 12
linux-core/xgi_fence.c | 87 -
shared-core/drm.h | 318
shared-core/i915_drm.h | 52
shared-core/nouveau_drm.h | 35
shared-core/nouveau_drv.h |2
shared-core/nouveau_reg.h |4
shared-core/nv50_graph.c|1
shared-core/radeon_drm.h| 131 +
shared-core/via_drv.c | 40
shared-core/via_drv.h | 14
shared-core/via_map.c | 10
tests/modetest/modetest.c |2
58 files changed, 2002 insertions(+), 7642 deletions(-)
New commits:
commit de1ed01214874dcdd6116ff2587c8710d6ed4d2d
Author: Dave Airlie airl...@redhat.com
Date: Tue Jun 30 12:19:28 2009 +1000
radeon: add support for write followed by read relocs.
the DDX does this and used to handle it internally
diff --git a/libdrm/radeon/radeon_cs_gem.c b/libdrm/radeon/radeon_cs_gem.c
index b9f6f4b..82ef16c 100644
--- a/libdrm/radeon/radeon_cs_gem.c
+++ b/libdrm/radeon/radeon_cs_gem.c
@@ -144,12 +144,19 @@ static int cs_gem_write_reloc(struct radeon_cs *cs,
* domain set then the read_domain should also be set for this
* new relocation.
*/
-if (reloc-read_domain !read_domain) {
-return -EINVAL;
-}
-if (reloc-write_domain !write_domain) {
-return -EINVAL;
+/* the DDX expects to read and write from same pixmap */
+if (write_domain (reloc-read_domain write_domain)) {
+reloc-read_domain = 0;
+reloc-write_domain = write_domain;
+} else if (read_domain reloc-write_domain) {
+reloc-read_domain = 0;
+} else {
+if (write_domain != reloc-write_domain)
+return -EINVAL;
+if (read_domain != reloc-read_domain)
+return -EINVAL;
}
+
reloc-read_domain |= read_domain;
reloc-write_domain |= write_domain;
/* update flags */
commit 790097c51330090b2b7b90429b9ab8ddf259fd8e
Author: Dave Airlie airl...@redhat.com
Date: Tue Jun 23 09:51:05 2009 +1000
remove some old ttm bits
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index c8fec5f..2539966 100644
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
@@ -395,58 +395,6 @@ typedef struct drm_i915_hws_addr {
uint64_t addr;
} drm_i915_hws_addr_t;
-/*
- * Relocation header is 4 uint32_ts
- * 0 - 32 bit reloc count
- * 1 - 32-bit relocation type
- * 2-3 - 64-bit user buffer handle ptr for another list of relocs.
- */
-#define I915_RELOC_HEADER 4
-
-/*
- * type 0 relocation has 4-uint32_t stride
- * 0 - offset into buffer
- * 1 - delta to add in
-
drm-snapshot: Changes to 'refs/tags/debian/2.4.11+git+20090630+de1ed01-1'
Tag 'debian/2.4.11+git+20090630+de1ed01-1' created by Chris Lamb la...@debian.org at 2009-07-01 00:14 + tagging version debian/2.4.11+git+20090630+de1ed01-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkpKqlUACgkQ5/8uW2NPmiAiVQCfSCsA0t/zYRQ3HtiO3QS5+4in GxkAnAqmwRmN8B6Mojlq7Jb4kDBsjeSL =1bvI -END PGP SIGNATURE- Changes since 2.4.11+git+20090519+f355ad8-1: Ben Skeggs (5): nouveau: bump for 0.0.13 nv50: magic fix for 3d busted without the binary driver first issue nouveau: fill in bo-tiled field for referenced buffers nouveau: fix bo mapping issue nouveau: 0.0.14 + extend bo interface to support subrange mapping Chris Lamb (7): New upstream snapshot. Merge branch 'upstream-experimental' into debian-experimental Add detailed changelog entry. Close #535063 Bump Standards-Version to 3.8.2. Install to kernel/drivers/gpu/drm instead of char/drm and update dpkg-divert entries to suit to match layout of = ~2.6.29 (Closes: #531966) releasing version 2.4.11+git+20090630+de1ed01-1 Danny Tholen (1): nouveau: backlight support for ppc laptops Dave Airlie (3): libdrm/radeon: add initial libdrm_radeon remove some old ttm bits radeon: add support for write followed by read relocs. Jesse Barnes (1): modetest: use gtt unmap for object Michael Buesch (1): drm: Fix compilation on 2.6.30 Pekka Paalanen (1): Fix build on kernels 2.6.26 Thomas Hellstrom (1): drm: Strip old ttm. --- configure.ac|9 debian/changelog| 24 debian/control |2 debian/postrm.modules.in| 11 debian/preinst.modules.in | 13 debian/rules|4 libdrm/Makefile.am |6 libdrm/nouveau/libdrm_nouveau.pc.in |2 libdrm/nouveau/nouveau_bo.c | 187 +- libdrm/nouveau/nouveau_bo.h | 22 libdrm/nouveau/nouveau_device.c |6 libdrm/nouveau/nouveau_device.h |2 libdrm/nouveau/nouveau_drmif.h |3 libdrm/nouveau/nouveau_private.h|1 libdrm/nouveau/nouveau_pushbuf.c|4 libdrm/nouveau/nouveau_pushbuf.h| 23 libdrm/radeon/Makefile.am | 53 libdrm/radeon/libdrm_radeon.pc.in | 10 libdrm/radeon/radeon_bo.h | 179 ++ libdrm/radeon/radeon_bo_gem.c | 254 +++ libdrm/radeon/radeon_bo_gem.h | 42 libdrm/radeon/radeon_cs.h | 208 ++ libdrm/radeon/radeon_cs_gem.c | 551 +++ libdrm/radeon/radeon_cs_gem.h | 41 libdrm/radeon/radeon_track.c| 140 + libdrm/radeon/radeon_track.h| 64 linux-core/Makefile |2 linux-core/Makefile.kernel |7 linux-core/drmP.h | 21 linux-core/drm_agpsupport.c | 171 -- linux-core/drm_bo.c | 2730 linux-core/drm_bo_lock.c| 189 -- linux-core/drm_bo_move.c| 614 linux-core/drm_compat.c | 99 - linux-core/drm_drv.c| 36 linux-core/drm_fence.c | 829 -- linux-core/drm_fops.c | 35 linux-core/drm_object.c | 294 --- linux-core/drm_objects.h| 821 -- linux-core/drm_os_linux.h |8 linux-core/drm_proc.c | 102 - linux-core/drm_stub.c | 14 linux-core/drm_sysfs.c |8 linux-core/drm_ttm.c| 512 -- linux-core/drm_vm.c | 198 -- linux-core/nouveau_backlight.c | 93 + linux-core/via_buffer.c | 163 -- linux-core/via_fence.c | 169 -- linux-core/xgi_cmdlist.c|3 linux-core/xgi_drv.c| 11 linux-core/xgi_drv.h| 12 linux-core/xgi_fence.c | 87 - shared-core/drm.h | 318 shared-core/i915_drm.h | 52 shared-core/nouveau_drm.h | 35 shared-core/nouveau_drv.h |2 shared-core/nouveau_reg.h |4 shared-core/nv50_graph.c|1 shared-core/radeon_drm.h| 131 + shared-core/via_drv.c | 40 shared-core/via_drv.h | 14 shared-core/via_map.c | 10 tests/modetest/modetest.c |2 63 files changed, 2044 insertions(+), 7654 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#531966: fails to load nouveau kernel module
Julien Cristau wrote: sigh. full dmesg and X log, for crying out loud. And dpkg -l output for nouveau and drm packages; would guess you have some mismatched version. (Hey, why not use reportbug that does all of this for you?) Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#515717: xserver-xorg-video-nouveau_1:0.0.10~git+20090205+4dfd0b1-1(hppa/exp erimental): FTBFS
Chris Lamb wrote: Frank Lichtenheld wrote: your package failed to build from source. [..] lambyAnyway, I'll check the hppa buildd logs in a few days. Frank, any idea why a the latest version has not been attempted yet? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
xserver-xorg-video-nouveau: Changes to 'debian-experimental'
configure.ac |9 debian/changelog | 260 debian/control|4 src/Makefile.am |5 src/drmmode_display.c | 925 +-- src/drmmode_display.h | 67 - src/nouveau_bios.h| 76 - src/nouveau_calc.c| 612 ++ src/nouveau_crtc.h|1 src/nouveau_dri2.c| 213 +++ src/nouveau_exa.c | 326 - src/nouveau_hw.c | 970 src/nouveau_hw.h | 335 + src/nouveau_local.h | 26 src/nouveau_xv.c | 212 --- src/nv04_exa.c| 20 src/nv04_xv_blit.c|6 src/nv10_exa.c| 10 src/nv10_xv_ovl.c |6 src/nv30_exa.c|8 src/nv30_xv_tex.c | 15 src/nv40_exa.c| 22 src/nv40_xv_tex.c |4 src/nv50_connector.c | 20 src/nv50_crtc.c | 23 src/nv50_dac.c|4 src/nv50_display.c|1 src/nv50_exa.c| 32 src/nv50_output.c | 153 +- src/nv50_randr.c | 70 - src/nv50_sor.c| 97 - src/nv50_xv.c | 21 src/nv50reg.h | 13 src/nv_bios.c | 3004 +++--- src/nv_const.h|6 src/nv_crtc.c | 1093 -- src/nv_cursor.c | 473 +-- src/nv_dac.c | 17 src/nv_dma.c | 11 src/nv_dri.c | 141 -- src/nv_driver.c | 492 src/nv_hw.c | 947 --- src/nv_i2c.c | 37 src/nv_include.h |4 src/nv_output.c | 815 + src/nv_proto.h| 80 - src/nv_setup.c| 92 - src/nv_shadow.c | 50 src/nv_type.h | 181 +-- src/nvreg.h | 539 50 files changed, 6786 insertions(+), 5762 deletions(-) New commits: commit 36317b29353fbb6b2d6c2533cae52409654e8a51 Author: Chris Lamb la...@debian.org Date: Wed May 20 10:18:00 2009 +0100 releasing version 1:0.0.10~git+20090519+9656762-1 diff --git a/debian/changelog b/debian/changelog index 4d2205c..bfe275f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) UNRELEASED; urgency=low +xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) experimental; urgency=low * New upstream snapshot (Closes: #526144, #524456) - 9656762... nv50: fix multiple-display hangs when encoders swap crtcs @@ -256,7 +256,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) UNRELEASED; urgency * Bump Standards-Version to 3.8.1. * Bump build dependency on libdrm-dev to 2.4.11. - -- Chris Lamb la...@debian.org Tue, 19 May 2009 23:16:52 +0100 + -- Chris Lamb la...@debian.org Wed, 20 May 2009 10:17:53 +0100 xserver-xorg-video-nouveau (1:0.0.10~git+20090205+4dfd0b1-1) experimental; urgency=low commit 763d5bea2cdb4e0ff92739b5ece5ece67a83c8fe Author: Chris Lamb la...@debian.org Date: Tue May 19 23:36:20 2009 +0100 Add bug #524456 which is fixed by rebuilding. Signed-off-by: Chris Lamb la...@debian.org diff --git a/debian/changelog b/debian/changelog index af63c5a..4d2205c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) UNRELEASED; urgency=low - * New upstream snapshot (Closes: #526144) + * New upstream snapshot (Closes: #526144, #524456) - 9656762... nv50: fix multiple-display hangs when encoders swap crtcs - d70eed9... randr12: fix digital dpms regression - 1072103... exa: use exaDriverAlloc() to prevent issues across exa commit e6459c3c5cbab59baa552f7d9bcf0ac386391140 Author: Chris Lamb la...@debian.org Date: Tue May 19 23:21:29 2009 +0100 Bump build dependency on libdrm-dev to 2.4.11. diff --git a/debian/changelog b/debian/changelog index 6cec485..af63c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -254,6 +254,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20090519+9656762-1) UNRELEASED; urgency - ba1f897... keep resources around after leavevt, far too problematic currently * Bump Standards-Version to 3.8.1. + * Bump build dependency on libdrm-dev to 2.4.11. -- Chris Lamb la...@debian.org Tue, 19 May 2009 23:16:52 +0100 diff --git a/debian/control b/debian/control index 29ff51b..d8361dd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Chris Lamb la...@debian.org, Matthew Johnson mj...@debian.org -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 +Build-Depends: debhelper (= 7), pkg-config, xserver-xorg
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
configure.ac |9
src/Makefile.am |5
src/drmmode_display.c | 925 +--
src/drmmode_display.h | 67 -
src/nouveau_bios.h| 76 -
src/nouveau_calc.c| 612 ++
src/nouveau_crtc.h|1
src/nouveau_dri2.c| 213 +++
src/nouveau_exa.c | 326 -
src/nouveau_hw.c | 970
src/nouveau_hw.h | 335 +
src/nouveau_local.h | 26
src/nouveau_xv.c | 212 ---
src/nv04_exa.c| 20
src/nv04_xv_blit.c|6
src/nv10_exa.c| 10
src/nv10_xv_ovl.c |6
src/nv30_exa.c|8
src/nv30_xv_tex.c | 15
src/nv40_exa.c| 22
src/nv40_xv_tex.c |4
src/nv50_connector.c | 20
src/nv50_crtc.c | 23
src/nv50_dac.c|4
src/nv50_display.c|1
src/nv50_exa.c| 32
src/nv50_output.c | 153 +-
src/nv50_randr.c | 70 -
src/nv50_sor.c| 97 -
src/nv50_xv.c | 21
src/nv50reg.h | 13
src/nv_bios.c | 3004 +++---
src/nv_const.h|6
src/nv_crtc.c | 1093 --
src/nv_cursor.c | 473 +--
src/nv_dac.c | 17
src/nv_dma.c | 11
src/nv_dri.c | 141 --
src/nv_driver.c | 492
src/nv_hw.c | 947 ---
src/nv_i2c.c | 37
src/nv_include.h |4
src/nv_output.c | 815 +
src/nv_proto.h| 80 -
src/nv_setup.c| 92 -
src/nv_shadow.c | 50
src/nv_type.h | 181 +--
src/nvreg.h | 539
48 files changed, 6524 insertions(+), 5760 deletions(-)
New commits:
commit 9656762ba186e91dd2b3b7f3f9427ba520982f9d
Author: Ben Skeggs bske...@redhat.com
Date: Thu May 14 10:26:44 2009 +1000
nv50: fix multiple-display hangs when encoders swap crtcs
diff --git a/src/nouveau_crtc.h b/src/nouveau_crtc.h
index d86dc90..45d0eee 100644
--- a/src/nouveau_crtc.h
+++ b/src/nouveau_crtc.h
@@ -32,6 +32,7 @@ typedef struct nouveauCrtc {
char *name;
uint8_t index;
Bool active;
+ Bool blanked;
/* Scanout area. */
struct nouveau_bo * front_buffer;
diff --git a/src/nv50_crtc.c b/src/nv50_crtc.c
index 64dc85f..3502dd7 100644
--- a/src/nv50_crtc.c
+++ b/src/nv50_crtc.c
@@ -308,6 +308,8 @@ NV50CrtcBlank(nouveauCrtcPtr crtc, Bool blanked)
NV50CrtcCommand(crtc, NV84_CRTC0_BLANK_UNK1,
NV84_CRTC0_BLANK_UNK1_UNBLANK);
NV50CrtcCommand(crtc, NV50_CRTC0_BLANK_CTRL,
NV50_CRTC0_BLANK_CTRL_UNBLANK);
}
+
+ crtc-blanked = blanked;
}
static void
diff --git a/src/nv50_randr.c b/src/nv50_randr.c
index 3459f05..a261a3b 100644
--- a/src/nv50_randr.c
+++ b/src/nv50_randr.c
@@ -67,17 +67,35 @@ nv50_crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
static void
nv50_crtc_prepare(xf86CrtcPtr crtc)
{
- ScrnInfoPtr pScrn = crtc-scrn;
NV50CrtcPrivatePtr nv_crtc = crtc-driver_private;
- xf86DrvMsg(pScrn-scrnIndex, X_INFO, nv50_crtc_prepare is called for
%s.\n, nv_crtc-crtc-index ? CRTC1 : CRTC0);
-
+ ScrnInfoPtr pScrn = crtc-scrn;
NVPtr pNv = NVPTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ nouveauOutputPtr output;
+ int i;
+
+ /* Rewire internal stucts to match randr-1.2... yet again.. */
+ for (i = 0; i xf86_config-num_output; i++) {
+ xf86OutputPtr output = xf86_config-output[i];
+ NV50OutputPrivatePtr nv50_output = output-driver_private;
+ nouveauOutputPtr nv_output = nv50_output-output;
+
+ if (output-crtc) {
+ NV50CrtcPrivatePtr nv50_crtc =
+ output-crtc-driver_private;
+ nv_output-crtc = nv50_crtc-crtc;
+ } else {
+ nv_output-crtc = NULL;
+ }
+ }
+
+ xf86DrvMsg(pScrn-scrnIndex, X_INFO,
+ nv50_crtc_prepare is called for %s.\n,
+ nv_crtc-crtc-index ? CRTC1 : CRTC0);
nv_crtc-crtc-active = TRUE;
nv_crtc-crtc-modeset_lock = TRUE;
- nouveauOutputPtr output;
-
/* Detach any unused outputs. */
for (output = pNv-output; output != NULL; output = output-next) {
if (!output-crtc)
@@ -171,7 +189,8 @@ nv50_crtc_show_cursor(xf86CrtcPtr crtc)
NV50CrtcPrivatePtr nv_crtc = crtc-driver_private;
//xf86DrvMsg(pScrn-scrnIndex, X_INFO, nv50_crtc_show_cursor is called
for %s.\n, nv_crtc-crtc-index ? CRTC1 : CRTC0);
- nv_crtc-crtc-ShowCursor(nv_crtc-crtc, FALSE);
+ if (!nv_crtc-crtc-blanked)
+ nv_crtc-crtc-ShowCursor(nv_crtc-crtc, FALSE);
}
static void
commit d70eed91b2909ba0b20415ab1d5a099fb6b39b08
Author: Stuart Bennett stu...@freedesktop.org
Date: Tue May 12 16:54:33 2009
xserver-xorg-video-nouveau: Changes to 'refs/tags/debian/0.0.10-git+20090519+9656762-1'
Tag 'debian/0.0.10-git+20090519+9656762-1' created by Chris Lamb la...@debian.org at 2009-05-20 09:18 + Uploading 0.0.10-git+20090519+9656762-1 to experimental. Changes since xserver-xorg-video-nouveau-0.0.10-git+20090205+4dfd0b1-1: Ben Skeggs (74): keep resources around after leavevt, far too problematic currently kms: update drmmode_display exa: remove notifier waits in UTS/DFS xv: remove notifier usage exa: don't need exaMarkSync on DFS, the operation will be done already exa: remove exaWaitSync() call in nouveau_exa_pixmap_map() exa: preparation for reintroducing driver-controlled pixmaps exa: reimplement driver-controlled pixmaps default to autodetecting whether to enable the driver's kms paths nv50/exa: properly align offset for mem_tile ioctl clear the scanout buffer on statup to avoid seeing garbage on-screen kms: fix resize func kms: fix check for xf86drmMode.h move memset of fb after NVSave(), hopefully fix lost VGA fonts nv30/xv: restore original viewport/clipping after putimage kms: implement dpms kms: work around some bong hits with dpms kms: remove early-exit from gamma_set, the kernel side works now kms: work around some xserver stupidity with DPMS kms: get current values for output properties on startup kms: cleanup set_property improve drm/dri initialisation code exa: fix multiple prepare/finish_access on a pixmap Call NVEnterVT from NVScreenInit rather than duplicating it. kms: copy old fb to new fb on modeset kms: support framebuffer resize if driver pixmaps enabled dri2: initial implementation, only with driver pixmaps dri: pass object handle instead of offset if using real mm fix ppc build more ppc.. another ppc fix device close doesn't belong in DRI close, can have DRM without DRI dri: fail harder kms: drm_mode_modeinfo struct changed names at some point kms: implement AdjustFrame, should fix crash in fdo#24236 nv50: call NVSync() in CloseScreen() before restoring video mode nv50/xv: correct rendering to partically obscured windows kms: check for mm_enabled as an additional test for kms presence randr: fix crash when rotation requested kms: fix bug which prevented getting edid from the kernel nv50: add default modes to mode pool for LVDS panel kms: small cleanup xv: post damage after we draw (rh#492239) xv: oops kms: CONNECTORn - CONNECTOR-n bios: support for pll limits table v3.0 bios: xf86DrvMsg-NV_ERROR bios: fix chips with pll limits table version 0 nv50: fix i2c port addresses consistent connector naming across nv50, nv50 and kms bios: add exception for chipset 0x73 for lack of fp table bios: some G8x don't have PBUS at 0x1800, us 0x88000 unconditionally there bios: fix typo kms: fix setting the randr edid property nv50: modify ddc-nvreg assignments again.. bios: logic typo from earlier commit do e-edid for legacy modesetting path kms: fix displayWidth in resize Remove pNv-GART conditional for selecting CB_LOCATION in AGP/PCI nv50: use vbios-programmed lvds mode as native mode if no ddc nv50: missed a WAIT_RING bios: parse BIT U table bios: dcb location is only 2 bits bios: some nv50 init scripts have flags in reg values, deal with (130) bios/nv50: initial parsing of display script tables, not quite complete nv50: merge NV50SorSetClockMode and NV50SorSetClockModeLVDS bios: modify get_fp_strap() for g80 bios: remove dodgy mode-table search for g80 nv50: group encoders into connectors by i2c port nv50: remove reading back vbios-programmed lvds native mode bios: use NV_ARCH_50 to match G8x chips nv50: return immediately in GetDDCModes if no DDC on connector... exa: use exaDriverAlloc() to prevent issues across exa changes nv50: fix multiple-display hangs when encoders swap crtcs Chris Lamb (6): Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot (Closes: #526144) Bump Standards-Version to 3.8.1. Bump build dependency on libdrm-dev to 2.4.11. Add bug #524456 which is fixed by rebuilding. releasing version 1:0.0.10~git+20090519+9656762-1 Francisco Jerez (1): Fix nouveau_hw_decode_pll on NV30/35. Maarten Maathuis (16): Fix some cursor fallout, mostly in legacy code. Fix a few warnings. Always allocate 2 hw cursors. exa: add nouveau_exa_pixmap_is_tiled bios: implement opcode 0x76 (INIT_IO_CONDITION). bios: fix create_i2c_device for g80 bios: add some more valid regs nv50: correct a poorly written comment shadowfb: clip copied regions to frontbuffer size. nv04: unbreak copy exa: support major version 3
Bug#515717: xserver-xorg-video-nouveau_1:0.0.10~git+20090205+4dfd0b1-1(hppa/exp erimental): FTBFS
Frank Lichtenheld wrote: your package failed to build from source. | /usr/bin/ld: /usr/lib/gcc/hppa-linux-gnu/4.3.3/../../../libdrm_nouveau.a(nouveau_pushbuf.o): relocation R_PARISC_DPREL21L can not be used when making a shared object; recompile with -fPIC | /usr/lib/gcc/hppa-linux-gnu/4.3.3/../../../libdrm_nouveau.a: could not read symbols: Bad value | collect2: ld returned 1 exit status | make[3]: *** [nouveau_drv.la] Error 1 | make[3]: Leaving directory lambyAny idea about the hppa FTBFS? (#515717) jcristau it's using a static libdrm_nouveau for some reason jcristau ah. that's because libdrm-dev didn't depend on libdrm-nouveau1 at the time jcristau so that should be fixed lambyAh, those arch-specific Depends? (which you removed, heh) jcristau yeah lambyOoi, what made you come to that conclusion? jcristau http://experimental.debian.net/fetch.php?pkg=xserver-xorg-video-nouveauver=1%3A0.0.10%7Egit%2B20090205%2B4dfd0b1-1arch=hppastamp=1235648408file=logas=raw jcristau libdrm-nouveau1 doesn't get installed jcristau so the shared lib isn't there, and -ldrm_nouveau uses the static one - fail. lambyack, ta. lambyDon't think I've come across that failure mode before. lambyAnyway, I'll check the hppa buildd logs in a few days. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'refs/tags/2.4.11+git+20090519+f355ad8-1'
Tag '2.4.11+git+20090519+f355ad8-1' created by Chris Lamb la...@debian.org at 2009-05-19 22:42 + Releasing drm-snapshot (2.4.11+git+20090519+f355ad8-1) experimental Changes since drm-snapshot-2.4.4+git+20090205+8b88036-1: Alan Coopersmith (2): Delete extra libdrm_lists.h line after libdrm_la_SOURCES in libdrm/Makefile.am Use C99 versions of __FUNCTION__ __volatile__ when not building with gcc Ben Skeggs (19): nouveau: fix some issues where buffer objects never get freed drm/nv50: let the card handle the initial context switch drm/nv50: correct ramfc pointer in channel header drm/nv50: use a slightly different initial context for nv96 drm/nv50: add context info for nv98 drm/nv50: fix nv9x chipsets libdrm: make libdrm_nouveau conditional, disabled by default nv50: context info for chipset 0xa0 nv40: fail completely if we don't have a ctxprog for the chipset libdrm/nouveau: fix dma debugging libdrm/nouveau: free drmVersion after we're done with it drm/nouveau: make portion of vram as reserved for PRAMIN on all chipsets libdrm/nouveau: implement bo_handle_get for !mm_enabled libdrm/nouveau: incr refcount on ref fence before decr on old fence libdrm/nouveau: remove unneccesary null ptr checks libdrm/nouveau: ask the kernel for vram/gart aperture sizes libdrm/nouveau: fix typo in nouveau_device_close() nouveau: store bo handle in public struct in bo_ref_handle nouveau: write posting got lost somewhere, bring it back Carl Worth (1): Add new drm_intel_get_pipe_from_crtc_id function. Chris Lamb (7): Add bug numbers for already-added entries. Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot. (closes: #525154) Bump Standards-Version to 3.8.1. Update binary package Section fields Add missing deletion of drm_mode.h which is provided by linux-libc-dev. releasing version 2.4.11+git+20090519+f355ad8-1 Danny Tholen (1): nouveau: fix ppc for swab changes in Linux 2.6.29 Dave Airlie (2): drm: fix test makefile libdrm/mode: align subpixel results Eric Anholt (9): intel: Clear ioctl parameter outvalues and pads that confuse valgrind. intel: Add a new bufmgr alloc function to get BOs ready for rendering to. Bump version to 2.4.5 for new API additions. Fix distcheck for optional nouveau stuff. Add libdrm_intel.pc by popular demand. intel: Don't copy dirty data out when freeing a BO in the fake bufmgr. intel: Update reloc_tree_size of the first buffer when we count the tree size. intel: Only do BO caching up to 64MB objects. intel: quiet a warning. Ivan Kokshaysky (1): Fix DRM_CAS() on Alpha. (#16549) Jakob Bornecrantz (1): mode: Make xfdrmMode.[c|h] not depend on drm_mode.h Jesse Barnes (7): libdrm/intel: support GTT maps correctly libdrm: bump version to 2.4.6 libdrm: speed up connector mode fetching Revert libdrm: speed up connector mode fetching Bump version to 2.4.8 Bump version to 2.4.9 intel: NULL fake bo block when freeing in evict_all Julien Cristau (4): Let linux-libc-dev provide some drm headers Build with --enable-nouveau-experimental-api On Linux, let udev create the device files. Make libdrm-dev depend on libdrm-nouveau1 on all archs. Keith Packard (4): libdrm/intel: assert that clients are using bo refcounting correctly libdrm/intel: add drm_intel_bo_disable_reuse api Bump to version 2.4.10 to mark addition of drm_intel_bo_disable_reuse libdrm/intel: Make get_pipe_from_crtc_id per-bufmgr. Return -1 on failure. Kristian Høgsberg (9): modetest: Print names of properties. nouveau: Also dist nouveau_private.h. nouveau: Dist nouvea_dma.h as well. Use libudev in test case to only run gem tests for intel devices. XFAIL auth and lock test cases Skip tests that require root test: Makefile.am grammar nazi test: Avoid recursive dependency in makefile Bump version to 2.4.7 Maarten Maathuis (1): libdrm/nouveau: unref fences when deleting bo Matthew Garrett (2): nouveau: Add in-kernel backlight control support nv40, nv50: fix backlight build for 2.6.29 kernels Pekka Paalanen (17): nouveau: fix type warnings: void* arith, un/signed Remove i915 driver sources from linux-core drm_compat: remove kmap_atomic_prot_pfn() nouveau: support backlight only when kernel does Fix fix distcheck for optional nouveau stuff. drm: build fix for Linux drm_vblank_cleanup() drm, ati: fix printf format warnings drm: drm_bo_mmap_locked() is static. drm: drop Linux = 2.6.8 support drm: drop Linux 2.6.10 support drm: drop Linux 2.6.12 support drm: drop Linux 2.6.15 support drm: drop Linux 2.6.16
Re: drm-snapshot: Changes to 'debian-experimental'
Julien Cristau wrote: Hi Chris, some questions about this commit: commit 1d9453586fd1712791ac9cae6e1c27cff6815d2a Author: Chris Lamb la...@debian.org Date: Thu Feb 5 00:04:24 2009 + Build new libdrm-nouveau1 and libdrm-nouveau1-dbg packages. [..] Any particular reason for restricting the dependency on -nouveau1 to these architectures? The package itself is arch:any. Hm. You know, I think I just copied what libdrm-intel1 does, except I added powerpc as Nouveau works on that arch. I can't actually remember why libdrm-intel1 was relaxed like that though? Do we want to also build it from libdrm for sid, and/or upload the nouveau driver to sid and squeeze? I think we do. I wonder though - in the past I've found that Nouveau is rather too dependent on having an up-to-date libdrm; I fear we'd have to use some random (and oldish) git version of Nouveau which kinda misses the point of throwing it to the masses. What do you think? Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#518411: does not build libdrm_nouveau1
Tormod Volden wrote: Actually, this might happen because I am pulling down a newer version from upstream It is. There was an additional issue with building lidrm_nouveau, hence the lack of the upload recently. Regards, -- Chris Lamb, UK ch...@chris-lamb.co.uk GPG: 0x634F9A20 signature.asc Description: PGP signature
Bug#518411: does not build libdrm_nouveau1
Tormod Volden wrote: It built just fine here with the above patch, https://launchpad.net/~xorg-edgers/+archive/ppa/+sourcepub/508239/+listing-archive-extra but I haven't actually tried installing and running it. Great, was probably just a temporary thing. Thanks for the follow up. Regards, -- Chris Lamb, UK ch...@chris-lamb.co.uk GPG: 0x634F9A20 signature.asc Description: PGP signature
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
configure.ac |4
src/Makefile.am| 15
src/drmmode_display.c |4
src/nouveau_bios.h | 11
src/nouveau_bo.c | 163 -
src/nouveau_bo.h | 51
src/nouveau_channel.c | 136 -
src/nouveau_channel.h | 37
src/nouveau_class.h| 6231 -
src/nouveau_device.c | 137 -
src/nouveau_device.h | 29
src/nouveau_dma.c | 200 -
src/nouveau_dma.h | 158 -
src/nouveau_drmif.h| 185 -
src/nouveau_exa.c | 509
src/nouveau_grobj.c| 107
src/nouveau_grobj.h| 41
src/nouveau_local.h| 101
src/nouveau_notifier.c | 140 -
src/nouveau_notifier.h | 43
src/nouveau_xv.c | 70
src/nv04_exa.c | 354 ++
src/nv04_xv_blit.c |2
src/nv10_exa.c | 62
src/nv30_exa.c | 44
src/nv30_shaders.c |5
src/nv30_xv_tex.c |7
src/nv40_exa.c | 42
src/nv40_xv_tex.c |3
src/nv50_accel.c | 76
src/nv50_connector.c |3
src/nv50_crtc.c| 39
src/nv50_exa.c | 134 -
src/nv50_randr.c |2
src/nv50_xv.c | 109
src/nv_accel_common.c | 58
src/nv_bios.c | 550 ++--
src/nv_crtc.c | 101
src/nv_cursor.c| 29
src/nv_dac.c |4
src/nv_dma.c | 51
src/nv_dri.c | 10
src/nv_driver.c| 209 +
src/nv_exa.c | 968 ---
src/nv_hw.c| 33
src/nv_include.h |9
src/nv_output.c|2
src/nv_proto.h | 33
src/nv_setup.c |4
src/nv_shadow.c|2
src/nv_type.h | 21
src/nvreg.h| 10
52 files changed, 1953 insertions(+), 9395 deletions(-)
New commits:
commit 4dfd0b1b21415c48c4b6e0e8d335f3fc70922d27
Author: Ben Skeggs skeg...@gmail.com
Date: Wed Feb 4 15:35:53 2009 +1000
oops
diff --git a/src/nv_driver.c b/src/nv_driver.c
index c6a4441..303e42f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1584,22 +1584,24 @@ NVMapMemSW(ScrnInfoPtr pScrn)
CLUTOffset[0] = Cursor1Offset + (64 * 1024);
CLUTOffset[1] = CLUTOffset[0] + (4 * 1024);
- ret = nouveau_bo_fake(dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
- 0, pNv-VRAMSize - (120), pNv-VRAMMap,
+ ret = nouveau_bo_fake(dev, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
+ pNv-VRAMSize - (120), pNv-VRAMMap,
pNv-FB);
if (ret)
return FALSE;
pNv-GART = NULL;
- ret = nouveau_bo_fake(dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
- Cursor0Offset, 64*1024,
- pNv-VRAMMap + Cursor0Offset, pNv-Cursor);
+ ret = nouveau_bo_fake(dev, Cursor0Offset,
+ NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
+ 64*1024, pNv-VRAMMap + Cursor0Offset,
+ pNv-Cursor);
if (ret)
return FALSE;
- ret = nouveau_bo_fake(dev, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
- Cursor1Offset, 64*1024,
- pNv-VRAMMap + Cursor1Offset, pNv-Cursor2);
+ ret = nouveau_bo_fake(dev, Cursor1Offset,
+ NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
+ 64*1024, pNv-VRAMMap + Cursor1Offset,
+ pNv-Cursor2);
if (ret)
return FALSE;
@@ -1607,10 +1609,11 @@ NVMapMemSW(ScrnInfoPtr pScrn)
for(i = 0; i 2; i++) {
nouveauCrtcPtr crtc = pNv-crtc[i];
- ret = nouveau_bo_fake(dev, NOUVEAU_BO_VRAM |
- NOUVEAU_BO_PIN, CLUTOffset[i],
- 0x1000, pNv-VRAMMap +
- CLUTOffset[i], crtc-lut);
+ ret = nouveau_bo_fake(dev, CLUTOffset[i],
+ NOUVEAU_BO_VRAM |
+ NOUVEAU_BO_PIN, 0x1000,
+ pNv-VRAMMap + CLUTOffset[i],
+ crtc-lut);
if (ret)
return FALSE;
commit e02813aab0376271ee777a2b8dafc9381f96311a
Author: Ben Skeggs skeg...@gmail.com
Date: Wed Feb 4 14:50:35 2009 +1000
link against libdrm_nouveau (installed with libdrm)
diff --git a/configure.ac b/configure.ac
index 8588e05..efcb046 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,10 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
+PKG_CHECK_MODULES(LIBDRM_NOUVEAU, libdrm_nouveau)
+AC_SUBST(LIBDRM_NOUVEAU_CFLAGS)
+AC_SUBST(LIBDRM_NOUVEAU_LIBS)
+
PKG_CHECK_MODULES(XORG, [xorg-server =
xserver-xorg-video-nouveau: Changes to 'refs/tags/xserver-xorg-video-nouveau-0.0.10-git+20090205+4dfd0b1-1'
Tag 'xserver-xorg-video-nouveau-0.0.10-git+20090205+4dfd0b1-1' created by Chris Lamb la...@debian.org at 2009-02-08 18:35 + Releasing xserver-xorg-video-nouveau (1:0.0.10~git+20090205+4dfd0b1-1) experimental; urgency=low Changes since xserver-xorg-video-nouveau-0.0.10-git+20090105+7dc567d-1: Ben Skeggs (33): nv50: don't segfault if preinit fails before display setup done if CARD_INIT ioctl fails, report it instead of continuing Allow NoAccel operation without the DRM module present. Enable ShadowFB for DRM-less mode. Drop GPU resources on LeaveVT, reaquire on EnterVT hack a flush_notify() hook in to match ng remove unconditional FIRE_RING() in DoneComposite() hooks nv50/exa: ensure buffer usage is tracked correctly nv50/xv: ensure entire frame will fit in pushbuf without causing a flush exa: rework common pre-nv50 code in the same way nv50 code just was nv40/exa: resubmit state in composite as necessary nv30/exa: resubmit state in composite as needed nv10/exa: resubmit state in composite as needed nv50: forgotten buffer access flags during init nv50: remove some redundant init, this stuff is done as required now exa: ensure DFS state is updated across flushes exa: same for UTS state bo_del-bo_ref, closer to ng api blow up horribly if GPU access to mapped buffer is attempted exa: remove NVCopyROP table.. exa: remove driver pixmaps path that never worked here anyway exa: mass renaming and movement of nv04 solid/copy code to nv04_exa.c exa: small cleanup nv50/xv: previous xv commit was bonged - fix that add vm_vram_base field to nouveau_device instead of hardcoding 512MiB nv10: use the correct 3d object on NV1A nv50: make entire offscreen area tiled, use extra blits to scanout buffer Revert nv50: make entire offscreen area tiled, use extra blits to scanout buffer Revert Improve the NoAccel situation, but it's not working yet. fix NoAccel from when map/unmap became stricter require drm 0.0.12 link against libdrm_nouveau (installed with libdrm) oops Chris Lamb (6): Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot (Closes: #514080). Don't include .git in .orig.tar.gz Bump Build-Depends on libdrm-dev. Replace (C) in debian/copyright with © to appease lintian. Replace usage of `dh_clean -k` with dh_prep. Maarten Maathuis (3): nv50: Add a fallback for non-repeating XRGB pixmaps. nv50: small fix Improve the NoAccel situation, but it's not working yet. Stuart Bennett (24): Make turning on bios execution logging slightly easier No need of separate allocation for bios image randr12: avoid classic macro error Complain more about weird bios images nv04 blitter: use correct number of dma params for real nv04 twoStagePLL is actually a description of cards using two PLL regs randr12: no mmiotrace evidence for nv47 using the special pll bits randr12: no mmiotrace indication that the blob ever clears these bits randr12: better selection of nv4x single pll mode and some notes randr12: code motion and allow ramdac580 setting on nv40 randr12: lock independent crtc base registers separately (#19620) Remove a BITism from BMP parsing path, and move old style BMP init into common path Move the bios flat-panel pointers back into the bios struct Split out a function for finding the panel power sequencer stuff Fix stupidity introduced in 25de6b867f319099dac05ba84f170da0f0e6c803 Fix nv04+ IFC upload and frag prog upload Fix pasta error in bios opcode 4D Handle I2C device 0xff fallback for I2C bios opcodes Implement bios I2C opcode 4E (untested) Don't read obviously useless bios images, and drop 5x reading on PROM Make calling of init bios functions common Swap the order of calling parse_fp_mode_table and parse_lvds_manufacturer_table Split up parsing the bit structure, complain when necessary tables are missing Avoid any risk of parsing oscillation on if_is_24bit Younes Manton (1): xv: Unmap filter table BO after init so it can be validated (nv30,40) --- configure.ac |4 debian/changelog | 91 debian/control |2 debian/copyright | 46 debian/rules |3 src/Makefile.am| 15 src/drmmode_display.c |4 src/nouveau_bios.h | 11 src/nouveau_bo.c | 163 - src/nouveau_bo.h | 51 src/nouveau_channel.c | 136 - src/nouveau_channel.h | 37 src/nouveau_class.h| 6231 - src/nouveau_device.c | 137 - src/nouveau_device.h | 29 src/nouveau_dma.c | 200 - src/nouveau_dma.h | 158 - src/nouveau_drmif.h| 185 - src
Bug#514080: xserver-xorg-video-nouveau: new upstream snapshot
tags 514080 + pending thanks Please package a new upstream snapshot of nouveau. This package is prepared, tested and ready-to-upload but its drm-snapshot dependency will be taking a detour via NEW as it has grown some new binary packages. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'upstream-experimental'
README |9
configure.ac| 18
libdrm/Makefile.am |3
libdrm/intel/Makefile.am|1
libdrm/intel/intel_bufmgr_fake.c|2
libdrm/intel/intel_bufmgr_gem.c | 82
libdrm/intel/intel_chipset.h| 71
libdrm/nouveau/Makefile.am | 40
libdrm/nouveau/libdrm_nouveau.pc.in | 10
libdrm/nouveau/nouveau_bo.c | 838 +++
libdrm/nouveau/nouveau_bo.h | 97
libdrm/nouveau/nouveau_channel.c| 167
libdrm/nouveau/nouveau_channel.h| 56
libdrm/nouveau/nouveau_class.h | 8006
libdrm/nouveau/nouveau_device.c | 185
libdrm/nouveau/nouveau_device.h | 31
libdrm/nouveau/nouveau_dma.c| 215
libdrm/nouveau/nouveau_dma.h| 154
libdrm/nouveau/nouveau_drmif.h | 59
libdrm/nouveau/nouveau_fence.c | 249 +
libdrm/nouveau/nouveau_grobj.c | 138
libdrm/nouveau/nouveau_grobj.h | 48
libdrm/nouveau/nouveau_notifier.c | 146
libdrm/nouveau/nouveau_notifier.h | 63
libdrm/nouveau/nouveau_private.h| 203
libdrm/nouveau/nouveau_pushbuf.c| 276 +
libdrm/nouveau/nouveau_pushbuf.h| 160
libdrm/nouveau/nouveau_resource.c | 115
libdrm/nouveau/nouveau_resource.h | 48
libdrm/xf86drm.c| 23
libdrm/xf86drmMode.c| 21
libdrm/xf86drmMode.h|7
linux-core/Makefile | 29
linux-core/Makefile.kernel |2
linux-core/drm_compat.h |6
linux-core/drm_fops.c |2
linux-core/nv_drv.c | 94
linux-core/nv_drv.h |1
shared-core/i915_drm.h |2
shared-core/nouveau_drm.h | 123
shared-core/nouveau_drv.h |2
shared-core/nouveau_irq.c | 24
shared-core/nouveau_mem.c | 11
shared-core/nouveau_object.c|7
shared-core/nouveau_state.c | 23
shared-core/nv04_instmem.c |3
shared-core/nv50_graph.c|2
shared-core/nv_drv.h| 52
tests/modetest/Makefile.am |6
tests/modetest/modetest.c | 254 -
50 files changed, 11890 insertions(+), 294 deletions(-)
New commits:
commit 8b8803695b24d4cb4d041437a4709be06e59471b
Author: Kristian Høgsberg k...@redhat.com
Date: Wed Feb 4 12:17:13 2009 -0500
modetest: Add syntax to also specify a crtc when setting a mode.
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index f1c3bf3..9a82727 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -254,6 +254,7 @@ struct connector {
char mode_str[64];
struct drm_mode_modeinfo *mode;
drmModeEncoder *encoder;
+ int crtc;
};
static void
@@ -318,6 +319,9 @@ connector_find_mode(struct connector *c)
drmModeFreeEncoder(c-encoder);
}
+
+ if (c-crtc == -1)
+ c-crtc = c-encoder-crtc_id;
}
#ifdef HAVE_CAIRO
@@ -477,9 +481,14 @@ set_mode(struct connector *c, int count)
x = 0;
for (i = 0; i count; i++) {
+ int crtc_id;
if (c[i].mode == NULL)
continue;
- ret = drmModeSetCrtc(fd, c[i].encoder-crtc_id, fb_id, x, 0,
+
+ printf(setting mode %s on connector %d, crtc %d\n,
+ c[i].mode_str, c[i].id, c[i].crtc);
+
+ ret = drmModeSetCrtc(fd, c[i].crtc, fb_id, x, 0,
c[i].id, 1, c[i].mode);
x += c[i].mode-hdisplay;
@@ -503,6 +512,7 @@ void usage(char *name)
fprintf(stderr, \t-m\tlist modes\n);
fprintf(stderr, \t-f\tlist framebuffers\n);
fprintf(stderr, \t-s connector_id:mode\tset a mode\n);
+ fprintf(stderr, \t-s connector_id@crtc_id:mode\tset a mode\n);
fprintf(stderr, \n\tDefault is to dump all info.\n);
exit(0);
}
@@ -538,13 +548,15 @@ int main(int argc, char **argv)
break;
case 's':
modeset = strdup(optarg);
+ con_args[count].crtc = -1;
if (sscanf(optarg, %d:%64s,
con_args[count].id,
- con_args[count].mode_str) != 2)
+ con_args[count].mode_str) != 2
+ sscanf(optarg, %...@%d:%64s,
+ con_args[count].id,
+ con_args[count].crtc,
+ con_args[count].mode_str) != 3)
usage(argv[0]);
- printf(setting mode %s on connector %d\n,
- con_args[count].mode_str,
- con_args[count].id);
drm-snapshot: Changes to 'debian-experimental'
README |9 configure.ac| 18 debian/changelog| 52 debian/control | 35 debian/copyright| 82 debian/libdrm-nouveau1.install |1 debian/postrm.modules.in|8 debian/preinst.modules.in |8 debian/rules| 17 debian/source.lintian-overrides |4 libdrm/Makefile.am |3 libdrm/intel/Makefile.am|1 libdrm/intel/intel_bufmgr_fake.c|2 libdrm/intel/intel_bufmgr_gem.c | 82 libdrm/intel/intel_chipset.h| 71 libdrm/nouveau/Makefile.am | 40 libdrm/nouveau/libdrm_nouveau.pc.in | 10 libdrm/nouveau/nouveau_bo.c | 838 +++ libdrm/nouveau/nouveau_bo.h | 97 libdrm/nouveau/nouveau_channel.c| 167 libdrm/nouveau/nouveau_channel.h| 56 libdrm/nouveau/nouveau_class.h | 8006 libdrm/nouveau/nouveau_device.c | 185 libdrm/nouveau/nouveau_device.h | 31 libdrm/nouveau/nouveau_dma.c| 215 libdrm/nouveau/nouveau_dma.h| 154 libdrm/nouveau/nouveau_drmif.h | 59 libdrm/nouveau/nouveau_fence.c | 249 + libdrm/nouveau/nouveau_grobj.c | 138 libdrm/nouveau/nouveau_grobj.h | 48 libdrm/nouveau/nouveau_notifier.c | 146 libdrm/nouveau/nouveau_notifier.h | 63 libdrm/nouveau/nouveau_private.h| 203 libdrm/nouveau/nouveau_pushbuf.c| 276 + libdrm/nouveau/nouveau_pushbuf.h| 160 libdrm/nouveau/nouveau_resource.c | 115 libdrm/nouveau/nouveau_resource.h | 48 libdrm/xf86drm.c| 23 libdrm/xf86drmMode.c| 21 libdrm/xf86drmMode.h|7 linux-core/Makefile | 29 linux-core/Makefile.kernel |2 linux-core/drm_compat.h |6 linux-core/drm_fops.c |2 linux-core/nv_drv.c | 94 linux-core/nv_drv.h |1 shared-core/i915_drm.h |2 shared-core/nouveau_drm.h | 123 shared-core/nouveau_drv.h |2 shared-core/nouveau_irq.c | 24 shared-core/nouveau_mem.c | 11 shared-core/nouveau_object.c|7 shared-core/nouveau_state.c | 23 shared-core/nv04_instmem.c |3 shared-core/nv50_graph.c|2 shared-core/nv_drv.h| 52 tests/modetest/Makefile.am |6 tests/modetest/modetest.c | 254 - 58 files changed, 12033 insertions(+), 358 deletions(-) New commits: commit 09c023dba31bd40d2fca6ff3e9aff66611aab4ff Author: Chris Lamb la...@debian.org Date: Thu Feb 5 00:50:51 2009 + Re-order changelog entry to make it easier for ftpmasters. Signed-off-by: Chris Lamb la...@debian.org diff --git a/debian/changelog b/debian/changelog index e309b65..d89e28d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,16 @@ drm-snapshot (2.4.4+git+20090205+8b88036-1) experimental; urgency=low + * Build new libdrm-nouveau1 and libdrm-nouveau1-dbg packages. + * Unconditionally add/remove diverts in generated packages' maintainer +scripts to avoid problems when the module package is installed without a +kernel being present. Thanks to Christoph Goehre christoph.goe...@gmx.de +for the patch. (Closes: #513399) + * Replace references to KERNELDIR with LINUXDIR to fix compilation for a +kernel version other than the running one. Thanks to Tormod Volden +debian.tor...@gmail.com for the patch. (Closes: #511358) + * Don't include (~12MiB) .git/ in the original tarball. (Closes: #513394) + * Replace instances of (C) with © in debian/copyright to appease +lintian. * New upstream snapshot: - 8b88036... modetest: Add syntax to also specify a crtc when setting a mode. @@ -36,17 +47,6 @@ drm-snapshot (2.4.4+git+20090205+8b88036-1) experimental; urgency=low - badc634... libdrm: add autoconf check for clock_gettime - ca37077... libdrm: only check for vblank timeout if we caught EINTR - f4f76a6... libdrm: add timeout handling to drmWaitVBlank - * Unconditionally add/remove diverts in generated packages' maintainer -scripts to avoid problems when the module package is installed without a -kernel being present. Thanks to Christoph Goehre christoph.goe...@gmx.de -for the patch. (Closes: #513399) - * Replace references to KERNELDIR with LINUXDIR to fix compilation for a -kernel version other than the running one. Thanks to Tormod Volden -debian.tor...@gmail.com for the patch. (Closes: #511358) - * Don't include (~12MiB) .git/ in the original tarball. (Closes: #513394) - * Replace instances of (C) with © in debian/copyright to appease -lintian. - * Build new libdrm-nouveau1 and libdrm-nouveau1-dbg packages
drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.4.4+git+20090205+8b88036-1'
Tag 'drm-snapshot-2.4.4+git+20090205+8b88036-1' created by Chris Lamb la...@debian.org at 2009-02-05 00:51 + Releasing drm-snapshot (2.4.4+git+20090205+8b88036-1) experimental; urgency=low Changes since drm-snapshot-2.4.3+git+20090105+a8c5480-1: Ben Skeggs (5): nv50: ack nsource to prevent continuous protection fault irqs nv04-nv40: correct RAMHT size nv50: support chipset NV96 nouveau: bring in new mm api definitions, without the actual mm code nouveau: install libdrm_nouveau with libdrm Chris Lamb (9): Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot. Unconditionally add/remove diverts in generated packages' maint. scripts Replace references to KERNELDIR with LINUXDIR. Use unicode copyright symbol to appease lintian in debian/copyright. Use dh_prep over dh_clean -k. Build new libdrm-nouveau1 and libdrm-nouveau1-dbg packages. Don't include (~12MiB) .git/ in the original tarball. (Closes: #513394) Re-order changelog entry to make it easier for ftpmasters. Dave Airlie (1): drm: remove drmstat/dristat from linux-core build Eric Anholt (5): intel: Retry pin ioctl on -EINTR. bump version to 2.4.4 intel: Fix under-counting of fences registers required in check_aperture. intel: don't count fences on 965 and later, as they don't use them. Clean up README for the current state of kernel module affairs. Jesse Barnes (4): libdrm: add timeout handling to drmWaitVBlank libdrm: only check for vblank timeout if we caught EINTR libdrm: add autoconf check for clock_gettime intel: libdrm support for fence management in execbuf Kristian Høgsberg (6): No need to pin buffer anymore in modetest.c modetest: Use a more interesting test pattern. modetest: Handle setting modes on multiple crtcs with one fb. modetest: Don't sleep when just dumping state, wait for key for modeset. modetest: Use cairo (if available) to paint a better pattern. modetest: Add syntax to also specify a crtc when setting a mode. Owain G. Ainsworth (2): Remove drmModeReplaceFb after it was removed from the kernel. Don't use DRM_BO_FLAG_NO_MOVE in bufmgr fake. It's a ttm flag. Pekka Paalanen (1): drm compat: fix euid for =2.6.28 Stephane Marchesin (1): Remove the nv driver. Stuart Bennett (2): nouveau: no suspend support for nv50+ nouveau: don't save channel context if it has recently become invalid --- README |9 configure.ac| 18 debian/changelog| 52 debian/control | 35 debian/copyright| 82 debian/libdrm-nouveau1.install |1 debian/postrm.modules.in|8 debian/preinst.modules.in |8 debian/rules| 17 debian/source.lintian-overrides |4 libdrm/Makefile.am |3 libdrm/intel/Makefile.am|1 libdrm/intel/intel_bufmgr_fake.c|2 libdrm/intel/intel_bufmgr_gem.c | 82 libdrm/intel/intel_chipset.h| 71 libdrm/nouveau/Makefile.am | 40 libdrm/nouveau/libdrm_nouveau.pc.in | 10 libdrm/nouveau/nouveau_bo.c | 838 +++ libdrm/nouveau/nouveau_bo.h | 97 libdrm/nouveau/nouveau_channel.c| 167 libdrm/nouveau/nouveau_channel.h| 56 libdrm/nouveau/nouveau_class.h | 8006 libdrm/nouveau/nouveau_device.c | 185 libdrm/nouveau/nouveau_device.h | 31 libdrm/nouveau/nouveau_dma.c| 215 libdrm/nouveau/nouveau_dma.h| 154 libdrm/nouveau/nouveau_drmif.h | 59 libdrm/nouveau/nouveau_fence.c | 249 + libdrm/nouveau/nouveau_grobj.c | 138 libdrm/nouveau/nouveau_grobj.h | 48 libdrm/nouveau/nouveau_notifier.c | 146 libdrm/nouveau/nouveau_notifier.h | 63 libdrm/nouveau/nouveau_private.h| 203 libdrm/nouveau/nouveau_pushbuf.c| 276 + libdrm/nouveau/nouveau_pushbuf.h| 160 libdrm/nouveau/nouveau_resource.c | 115 libdrm/nouveau/nouveau_resource.h | 48 libdrm/xf86drm.c| 23 libdrm/xf86drmMode.c| 21 libdrm/xf86drmMode.h|7 linux-core/Makefile | 29 linux-core/Makefile.kernel |2 linux-core/drm_compat.h |6 linux-core/drm_fops.c |2 linux-core/nv_drv.c | 94 linux-core/nv_drv.h |1 shared-core/i915_drm.h |2 shared-core/nouveau_drm.h | 123 shared-core/nouveau_drv.h |2 shared-core/nouveau_irq.c | 24 shared-core/nouveau_mem.c | 11 shared-core/nouveau_object.c|7 shared-core/nouveau_state.c | 23 shared-core
Bug#513394: drm-snapshot: please build with 'git-buildpackage'
Christoph Goehre wrote: it would be nice to build your package with git-buildpackage or other those tools to avoid git blobs in the orig.tar.gz file. Only this binary blobs have a size round about 12 MB. The .git dir is currently in there so we can inject the exact version number into various places, but I didn't realise it was 12MB. Thanks for the report. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#511358: Fw: [PATCH] Use LINUXDIR instead of KERNELDIR in debian/rules
Package: drm-snapshot Begin forwarded message: Date: Fri, 9 Jan 2009 21:29:57 +0100 From: Tormod Volden debian.tor...@gmail.com To: Chris Lamb la...@debian.org Subject: [PATCH] Use LINUXDIR instead of KERNELDIR in debian/rules The Makefile in linux-core uses LINUXDIR for specifying the kernel source. Fixes compiling for another kernel version than the running one. --- debian/rules |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 09c6797..7dd3ad2 100755 --- a/debian/rules +++ b/debian/rules @@ -125,7 +125,7 @@ binary-modules: dh_clean -k # Build the modules - $(MAKE) -C linux-core KERNELDIR=$(KSRC) KVERREL=$(KVERS) \ + $(MAKE) -C linux-core LINUXDIR=$(KSRC) KVERREL=$(KVERS) \ EXTRA_CFLAGS=-DGIT_REVISION=\\\$(shell cat debian/git-revision)\\\ # Install the modules @@ -148,7 +148,7 @@ binary-modules: # (Invoked by module-assistant or make-kpkg) kdist_config kdist_configure: prep-deb-files kdist_clean: - $(MAKE) -C linux-core KERNELDIR=$(KSRC) KVERREL=$(KVERS) clean + $(MAKE) -C linux-core LINUXDIR=$(KSRC) KVERREL=$(KVERS) clean binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary binary-modules install get-orig-source -- 1.5.4.3 -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
Bug#511231: downgrade else life over
jida...@jidanni.org wrote: Dear Sirs, I am flabbergasted that you have stopped X in its tracks. Fortunately I did dpkg - warning: downgrading libdrm-intel1 from [..] P.S., fix the *ERROR* Unknown parameter 5 one day if you have spare time. Welcome to experimental, thanks for your motivating comments. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'debian-experimental'
.gitignore |2 bsd-core/drm_mode.h |1 configure.ac|4 debian/changelog| 1073 debian/rules|2 libdrm/Makefile.am |5 libdrm/intel/intel_bufmgr.h | 14 libdrm/intel/intel_bufmgr_gem.c | 281 +++- libdrm/xf86drm.c| 44 libdrm/xf86drm.h|6 libdrm/xf86drmMode.c| 686 ++ libdrm/xf86drmMode.h| 258 linux-core/Makefile |9 linux-core/Makefile.kernel |6 linux-core/drm_mode.h |1 shared-core/Makefile.am |1 shared-core/drm.h | 30 shared-core/drm_mode.h | 273 shared-core/i915_drm.h | 68 - shared-core/nv50_graph.c|6 shared-core/nv50_grctx.h| 2542 +--- shared-core/radeon_irq.c|6 tests/Makefile.am |4 tests/dristat.c |2 tests/modeprint/Makefile.am | 13 tests/modeprint/modeprint.c | 402 ++ tests/modetest/Makefile.am | 13 tests/modetest/modetest.c | 470 +++ 28 files changed, 5978 insertions(+), 244 deletions(-) New commits: commit 8a2fa385e1d776302ac198a19d02050d46c67fed Author: Chris Lamb la...@debian.org Date: Mon Jan 5 02:35:46 2009 + Correct spelling mistakes in upstream's changelog to please Lintian. Signed-off-by: Chris Lamb la...@debian.org diff --git a/debian/changelog b/debian/changelog index 835523a..333a69d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,7 +66,7 @@ drm-snapshot (2.4.3+git+20090105+a8c5480-1) experimental; urgency=low - 6d59bad... Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem - 72997fb... libdrm-radeon: be verbose on bo failure and cleanup cs a bit -- 15464f5... radeon: add gart useable size to report to userspace +- 15464f5... radeon: add gart usable size to report to userspace - 532c63c... radeon: upgrade atom headers - 213a71f... radeon: fix fence race condition hopefully - 195cc0d... drm/radeon: add dpms connector functions @@ -130,7 +130,7 @@ drm-snapshot (2.4.3+git+20090105+a8c5480-1) experimental; urgency=low ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem - 5d86195... radeon: libdrm_radeon updates bo cs interfaces - 1db35ba... libdrm: fix ABI change in drm_mode_get_encoder -- af118cd... radeon: reloc are backend dependant +- af118cd... radeon: reloc are backend dependent - 3b17b50... Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem - 7617d1f... radeon: radeon util library @@ -165,7 +165,7 @@ drm-snapshot (2.4.3+git+20090105+a8c5480-1) experimental; urgency=low - 89126bb... Merge branch 'modesetting-gem' of git+ssh://ag...@git.freedesktop.org/git/mesa/drm into modesetting-gem - d883347... radeon: first pass at using atombios on r4xx hw -- ea9711b... Seperate modesetting userspace bits into drm_mode.h +- ea9711b... Separate modesetting userspace bits into drm_mode.h - 35e379c... radeon: add r600 modesetting registers writes - dcf73de... radeon: add parsing for r6xx object tables - 840c9a3... Update intel modesetting to use mm_private instead of commit 3accb0515a5f2501b2bb1c868f49ef80e2cb9f46 Author: Chris Lamb la...@debian.org Date: Mon Jan 5 02:32:01 2009 + New upstream snapshot, bumping base version number to 2.4.3. Signed-off-by: Chris Lamb la...@debian.org diff --git a/debian/changelog b/debian/changelog index dd0ab73..835523a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,1079 @@ -drm-snapshot (2.4.1+git+20081116+930c0e7-2) UNRELEASED; urgency=low +drm-snapshot (2.4.3+git+20090105+a8c5480-1) experimental; urgency=low + [ Chris Lamb ] + * New upstream snapshot: (Closes: #509035) +- a8c5480... Remove executable from modeprint test dir +- 58d557c... [FreeBSD] Fix build on FreeBSD after modesetting import. +- b48bd3a... radeon: only write irq regs if irq is enabled +- dfd7fda... intel: Rename plane[AB]* back to pipe[AB]*. +- 28771e0... intel: Remove linux build of i915 DRM, as it's unmaintained + and a user trap. +- d221e00... intel: Sync GEM ioctl comments for easier diffing against + the kernel. +- 0243c9f... modetest: Print more stuff. Prettier. +- 06ab2f6... libdrm: Fix modetest/modeprint to use automake stuff. +- 18f091d... intel: Cache tiling/swizzle state in user mode. Reset tiling + on reuse. +- 40334c6... intel: Debug output %u vs uint64_t warning fix +- bd14b2c... intel: return error status from drm_intel_gem_bo_map +- b13f4e1... intel: Dump out memory usage information when the kernel + fails to pin +- 731cd55
drm-snapshot: Changes to 'upstream-experimental'
.gitignore |2
bsd-core/drm_mode.h |1
configure.ac|4
libdrm/Makefile.am |5
libdrm/intel/intel_bufmgr.h | 14
libdrm/intel/intel_bufmgr_gem.c | 281 +++-
libdrm/xf86drm.c| 44
libdrm/xf86drm.h|6
libdrm/xf86drmMode.c| 686 ++
libdrm/xf86drmMode.h| 258
linux-core/Makefile |9
linux-core/Makefile.kernel |6
linux-core/drm_mode.h |1
shared-core/Makefile.am |1
shared-core/drm.h | 30
shared-core/drm_mode.h | 273
shared-core/i915_drm.h | 68 -
shared-core/nv50_graph.c|6
shared-core/nv50_grctx.h| 2542 +---
shared-core/radeon_irq.c|6
tests/Makefile.am |4
tests/dristat.c |2
tests/modeprint/Makefile.am | 13
tests/modeprint/modeprint.c | 402 ++
tests/modetest/Makefile.am | 13
tests/modetest/modetest.c | 470 +++
26 files changed, 4906 insertions(+), 241 deletions(-)
New commits:
commit a8c548034e38d7fb8afeca100230818b3cfcb9d9
Author: Jesse Barnes jbar...@virtuousgeek.org
Date: Mon Dec 29 09:21:58 2008 -0800
Remove executable from modeprint test dir
Accidentally committed it with the mode setting changes.
diff --git a/tests/modeprint/app b/tests/modeprint/app
deleted file mode 100755
index 82085c8..000
Binary files a/tests/modeprint/app and /dev/null differ
commit 58d557c73b9e4ad1964fd083abeec74875c141cb
Author: Robert Noland rnol...@2hip.net
Date: Tue Dec 23 13:56:23 2008 -0500
[FreeBSD] Fix build on FreeBSD after modesetting import.
diff --git a/bsd-core/drm_mode.h b/bsd-core/drm_mode.h
new file mode 12
index 000..a43f138
--- /dev/null
+++ b/bsd-core/drm_mode.h
@@ -0,0 +1 @@
+../shared-core/drm_mode.h
\ No newline at end of file
diff --git a/shared-core/drm_mode.h b/shared-core/drm_mode.h
index 601d2bd..9b92733 100644
--- a/shared-core/drm_mode.h
+++ b/shared-core/drm_mode.h
@@ -27,11 +27,13 @@
#ifndef _DRM_MODE_H
#define _DRM_MODE_H
+#ifdef __linux__
#if !defined(__KERNEL__) !defined(_KERNEL)
#include stdint.h
#else
#include linux/kernel.h
#endif
+#endif
#define DRM_DISPLAY_INFO_LEN 32
#define DRM_CONNECTOR_NAME_LEN 32
commit b48bd3a036efa3c3aa759759a5be4f80f1c3ac72
Author: Dave Airlie airl...@redhat.com
Date: Tue Dec 23 11:22:44 2008 +1000
radeon: only write irq regs if irq is enabled
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index 6956996..836f384 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -44,7 +44,8 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask,
int state)
else
dev_priv-irq_enable_reg = ~mask;
- RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv-irq_enable_reg);
+ if (dev-irq_enabled)
+ RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv-irq_enable_reg);
}
static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state)
@@ -56,7 +57,8 @@ static void r500_vbl_irq_set_state(struct drm_device *dev,
u32 mask, int state)
else
dev_priv-r500_disp_irq_reg = ~mask;
- RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv-r500_disp_irq_reg);
+ if (dev-irq_enabled)
+ RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv-r500_disp_irq_reg);
}
int radeon_enable_vblank(struct drm_device *dev, int crtc)
commit dfd7fdafd8a2bad0d63ced4a969b6278c221c000
Author: Eric Anholt e...@anholt.net
Date: Wed Dec 17 13:55:53 2008 -0800
intel: Rename plane[AB]* back to pipe[AB]*.
The values are really going to continue meaning pipe, not plane, and that's
what they're called in the kernel copy of the header. Userland hasn't ever
made the switch to pipe!=plane, since userland checks are based on DRM
version, which is still stuck at 1.6. However, Mesa did start using
plane[AB] names, so provide a compat define.
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index 628f7f8..04ab4cf 100644
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
@@ -111,14 +111,25 @@ typedef struct drm_i915_sarea {
unsigned int rotated_tiled;
unsigned int rotated2_tiled;
- int planeA_x;
- int planeA_y;
- int planeA_w;
- int planeA_h;
- int planeB_x;
- int planeB_y;
- int planeB_w;
- int planeB_h;
+ /* compat defines for the period of time when pipeA_* got renamed
+* to planeA_*. They mean pipe, really.
+*/
+#define planeA_x pipeA_x
+#define planeA_y pipeA_y
+#define planeA_w pipeA_w
+#define planeA_h pipeA_h
+#define planeB_x pipeB_x
+#define planeB_y pipeB_y
+#define planeB_w pipeB_w
+#define planeB_h pipeB_h
+ int pipeA_x;
+ int pipeA_y;
+ int pipeA_w;
+
drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.4.3+git+20090105+a8c5480-1'
Tag 'drm-snapshot-2.4.3+git+20090105+a8c5480-1' created by Chris Lamb la...@debian.org at 2009-01-05 02:55 + Uploading drm-snapshot (2.4.3+git+20090105+a8c5480-1) to experimental. Changes since drm-snapshot-2.4.1+git+20081116+930c0e7-1: Alan Hourihane (96): Merge remote branch 'origin/modesetting-101' into modesetting-101 Remove extraneous drm_crtc.h include Use drm_framebuffer instead of drm_crtc for fb fbt Correct PCI ID for i845 Fix SDVO outputs Fix a register read that was swapped SDVOB/SDVOC Move SDVO PENDING check to read_response so all SDVO commands Check status after SDVO command for sdvo_set_control_bus_switch Support the RGB outputs of SDVO cards, which are essentially Merge remote branch 'origin/modesetting-101' into modesetting-101 When no valid EDID modes are available, we bail. free the duplicated mode. Fix build problem Fix return status Shouldn't free the mode here. It's done later on. Just some minor cleanups. Fix build problem Grab the default mode if the preferred mode isn't available. Move destruction of crtc as intelfb_remove uses the crtc to locate the fb. bring in change from drm_fb.c Set crtcinfo on temporary mode Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Fix merge problem. Move fbo creation to the specified fb driver which gives Change some printk's to DRM_DEBUG's Fix type/flags usage problem to check for preferred modes. Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 merge fixes Bring back code from merge that was accidentally removed. Move out the code from i915_dma_cleanup to unload to match don't copy back if an error was returned. no need to copy to/from user as the unlocked ioctl does Add brackets Add some more checks to modelist walking for matching Create memory pool for TT memory Set the fb_base, so userspace applications can actually work Fix some buffer teardown problems. should be unlocked Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Fix a crash on X startup Need fb attached Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 pass pointer for drmModeRmFB Pass pointer to drmModeRmMode. Use _size add missing lock remove duplicate and obsolete ioctl statements remove unused define Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Remove duplicate consistency Add missing round_jiffies_relative() for older kernels Fix function declaration build fix for older kernels fix some warnings build fix for older kernels DRM_CONTROL_ALLOW logic was reversed consistency make modefb/modedemo match each others test output. tweak it update app to cycle through 4 fbdev's Revert DRM_CONTROL_ALLOW logic was reversed After the previous revert fix libdrm to start at minor 1 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Fix up conflicts for DRI2 (untested) compatibility code for pci_get_bus_and_slot() minor test fixes fix SAREA Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 silence warning Implement short circuit for base change only define PRETHAW DRM_INFO - DRM_DEBUG DRM_INFO - DRM_DEBUG Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Add FENCE registers to MMIO list Fix connector description table propogate failed fixups back up Use ARRAY_SIZE Check mode before adding to EDID Add property info. build fix Add support for monitor hotplug signals/waits global hotplug events happen in the pipe A stat register, Add sample code to test hotplug events Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Fix green offset Older kernels don't have kobject_uevent_env(), so punt Fix test applications for recent DRM changes Fix build problems Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 Fix warnings more checks for NULL encoder so we don't segfault. Synchronize the DDC EDID read to it's fb_ddc.c counterpart set to 2.4.0 Alex Deucher (35): NV50: s/FALSE/false/ on_each_cpu() compat fixup from krh Brute force port of legacy crtc/encoder code unify connector, i2c handling for atom and legacy Add
Bug#505740: libdrm2: Version 2.4.1 is available
tags 505740 fixed-in-experimental thanks Julien Cristau wrote: By many you mean intel. And a new libdrm (not quite 2.4.1, but close enough) is already in experimental. libdrm 2.4.1 (plus 1 commit) is uploading to experimental as I write this. Regards, -- ,''`. : :' : Chris Lamb `. `'` [EMAIL PROTECTED] `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'debian-experimental'
configure.ac |2
debian/changelog | 19
debian/rules |2
libdrm/intel/intel_bufmgr.c | 73
libdrm/intel/intel_bufmgr.h | 179
libdrm/intel/intel_bufmgr_fake.c | 369 -
libdrm/intel/intel_bufmgr_gem.c | 449 +
libdrm/intel/intel_bufmgr_priv.h | 65
linux-core/drm_compat.h | 28
linux-core/nouveau_sgdma.c |4
linux-core/nv50_grctx.h |1
shared-core/i915_dma.c |4
shared-core/i915_drm.h | 13
shared-core/nv50_graph.c | 8041 -
shared-core/nv50_grctx.h | 9232 +++
shared-core/radeon_cp.c | 15
shared-core/radeon_drv.h | 10
17 files changed, 10008 insertions(+), 8498 deletions(-)
New commits:
commit 0b1d9dfcc9d72fadad329adad62947b31f971ab8
Author: Chris Lamb [EMAIL PROTECTED]
Date: Sun Nov 16 19:40:04 2008 +
Add changelog entries for 930c0e7.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 03a2f01..8d1a333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+drm-snapshot (2.4.1+git+20081116+930c0e7-1) experimental; urgency=low
+
+ * New upstream snapshot:
+- 930c0e7... intel: Restart on interrupt of bo_wait_rendering instead of
+ complaining.
+- 87e90c7... nouveau: compat fix for set_page_locked().
+- 00847da... libdrm 2.4.1.
+- 4b98264... intel: Rename dri_ and intel_ symbols to drm_intel_.
+- 0e86731... intel: Add dri_bufmgr_check_aperture support for bufmgr_gem.
+- e47ab7a... nv50: symlink nv50_grctx.h to linux-core...
+- 48b7390... nv50: move context-related tables a separate header file
+- 89ef1b5... drm: missing init_mm symbol, compatibility fix
+- 145d2d6... i915: Since FreeBSD doesn't have gem support yet, don't
+ advertise it.
+- e1372f6... radeon: fix error in busmaster enable logic
+- 848f00d... radeon: fix some fallout from the busmaster disable cleanup
+
+ -- Chris Lamb [EMAIL PROTECTED] Sun, 16 Nov 2008 19:39:10 +
+
drm-snapshot (2.3.1+git+20081027+1d930fc-1) experimental; urgency=low
* New upstream snapshot:
commit d8618be5f1348780d2338e70e959a0535bcb294c
Author: Chris Lamb [EMAIL PROTECTED]
Date: Sun Nov 16 19:37:15 2008 +
Update get-orig-source target for libdrm 2.4.1
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/rules b/debian/rules
index f8a49c6..2e9fa96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ get-orig-source:
git clone git://anongit.freedesktop.org/git/mesa/drm drm-snapshot \
cd drm-snapshot ./autogen.sh make distclean \
REVISION=$$(git show --pretty=format:%h HEAD | head -n1) \
- PREFIX=drm-snapshot_2.3.1+git+$$(date +%Y%m%d)+$$REVISION cd .. \
+ PREFIX=drm-snapshot_2.4.1+git+$$(date +%Y%m%d)+$$REVISION cd .. \
tar czf $$PREFIX.orig.tar.gz --exclude=autom4te.cache drm-snapshot \
rm -rf drm-snapshot
commit 930c0e7cf4f4776f7a69e7acc6fedeed7addb235
Author: Eric Anholt [EMAIL PROTECTED]
Date: Fri Nov 7 12:58:52 2008 -0800
intel: Restart on interrupt of bo_wait_rendering instead of complaining.
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index 5eaf5f5..9cb3359 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -658,7 +658,9 @@ drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo)
set_domain.handle = bo_gem-gem_handle;
set_domain.read_domains = I915_GEM_DOMAIN_GTT;
set_domain.write_domain = 0;
-ret = ioctl (bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+do {
+ ret = ioctl(bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+} while (ret == -1 errno == EINTR);
if (ret != 0) {
fprintf (stderr, %s:%d: Error setting memory domains %d (%08x %08x):
%s .\n,
__FILE__, __LINE__,
commit 87e90c73620b88005fcca5fd40d0b08932e1
Author: Pekka Paalanen [EMAIL PROTECTED]
Date: Sun Nov 2 13:48:32 2008 +0200
nouveau: compat fix for set_page_locked().
The set_page_locked() function has changed its name again.
2.6.28 offers __set_page_locked() instead, which uses non-atomic
__set_bit() to do the work. In this case, offer our own
set_page_locked() using the atomic set_bit(), because I do not know
if atomic access is really necessary. Atomic behaviour is the one
previously expected.
Signed-off-by: Pekka Paalanen [EMAIL PROTECTED]
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index e09be47..bc4d2e5 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -392,4 +392,17 @@ extern struct page *drm_vm_sg_nopage(struct vm_area_struct
*vma,
#endif
#endif
+#if (LINUX_VERSION_CODE KERNEL_VERSION(2,6,27))
+#define set_page_locked SetPageLocked
drm-snapshot: Changes to 'upstream-experimental'
configure.ac |2
libdrm/intel/intel_bufmgr.c | 73
libdrm/intel/intel_bufmgr.h | 179
libdrm/intel/intel_bufmgr_fake.c | 369 -
libdrm/intel/intel_bufmgr_gem.c | 449 +
libdrm/intel/intel_bufmgr_priv.h | 65
linux-core/drm_compat.h | 28
linux-core/nouveau_sgdma.c |4
linux-core/nv50_grctx.h |1
shared-core/i915_dma.c |4
shared-core/i915_drm.h | 13
shared-core/nv50_graph.c | 8041 -
shared-core/nv50_grctx.h | 9232 +++
shared-core/radeon_cp.c | 15
shared-core/radeon_drv.h | 10
15 files changed, 9988 insertions(+), 8497 deletions(-)
New commits:
commit 930c0e7cf4f4776f7a69e7acc6fedeed7addb235
Author: Eric Anholt [EMAIL PROTECTED]
Date: Fri Nov 7 12:58:52 2008 -0800
intel: Restart on interrupt of bo_wait_rendering instead of complaining.
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index 5eaf5f5..9cb3359 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -658,7 +658,9 @@ drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo)
set_domain.handle = bo_gem-gem_handle;
set_domain.read_domains = I915_GEM_DOMAIN_GTT;
set_domain.write_domain = 0;
-ret = ioctl (bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+do {
+ ret = ioctl(bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+} while (ret == -1 errno == EINTR);
if (ret != 0) {
fprintf (stderr, %s:%d: Error setting memory domains %d (%08x %08x):
%s .\n,
__FILE__, __LINE__,
commit 87e90c73620b88005fcca5fd40d0b08932e1
Author: Pekka Paalanen [EMAIL PROTECTED]
Date: Sun Nov 2 13:48:32 2008 +0200
nouveau: compat fix for set_page_locked().
The set_page_locked() function has changed its name again.
2.6.28 offers __set_page_locked() instead, which uses non-atomic
__set_bit() to do the work. In this case, offer our own
set_page_locked() using the atomic set_bit(), because I do not know
if atomic access is really necessary. Atomic behaviour is the one
previously expected.
Signed-off-by: Pekka Paalanen [EMAIL PROTECTED]
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index e09be47..bc4d2e5 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -392,4 +392,17 @@ extern struct page *drm_vm_sg_nopage(struct vm_area_struct
*vma,
#endif
#endif
+#if (LINUX_VERSION_CODE KERNEL_VERSION(2,6,27))
+#define set_page_locked SetPageLocked
+#elif (LINUX_VERSION_CODE KERNEL_VERSION(2,6,27))
+/*
+ * The kernel provides __set_page_locked, which uses the non-atomic
+ * __set_bit function. Let's use the atomic set_bit just in case.
+ */
+static inline void set_page_locked(struct page *page)
+{
+ set_bit(PG_locked, page-flags);
+}
+#endif
+
#endif
diff --git a/linux-core/nouveau_sgdma.c b/linux-core/nouveau_sgdma.c
index 739e025..1163baf 100644
--- a/linux-core/nouveau_sgdma.c
+++ b/linux-core/nouveau_sgdma.c
@@ -227,11 +227,7 @@ nouveau_sgdma_init(struct drm_device *dev)
dev_priv-gart_info.sg_dummy_page =
alloc_page(GFP_KERNEL|__GFP_DMA32);
-#if (LINUX_VERSION_CODE = KERNEL_VERSION(2,6,27))
set_page_locked(dev_priv-gart_info.sg_dummy_page);
-#else
- SetPageLocked(dev_priv-gart_info.sg_dummy_page);
-#endif
dev_priv-gart_info.sg_dummy_bus =
pci_map_page(dev-pdev, dev_priv-gart_info.sg_dummy_page, 0,
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b
Author: Eric Anholt [EMAIL PROTECTED]
Date: Thu Oct 30 11:36:46 2008 -0700
libdrm 2.4.1.
diff --git a/configure.ac b/configure.ac
index 92507cb..0f7c79e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.4.0, [EMAIL PROTECTED], libdrm)
+AC_INIT([libdrm], 2.4.1, [EMAIL PROTECTED], libdrm)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
commit 4b9826408f65976a1a13387beda748b65e03ec52
Author: Eric Anholt [EMAIL PROTECTED]
Date: Thu Oct 30 09:33:07 2008 -0700
intel: Rename dri_ and intel_ symbols to drm_intel_.
I wanted to avoid doing this, as it's a bunch of churn, but there was a
conflict between the dri_ symbols in libdrm and the symbols that were in
Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new
libdrm symbols. The new naming was recommended by cworth for giving the
code a unique prefix identifying where the code lives.
Additionally, take the opportunity to fix up two API mistakes: emit_reloc's
arguments were in a nonsensical order, and set_tiling lacked the stride
argument that the kernel will want to use soon. API compatibility
drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.4.1+git+20081116+930c0e7-1'
Tag 'drm-snapshot-2.4.1+git+20081116+930c0e7-1' created by Chris Lamb [EMAIL PROTECTED] at 2008-11-16 19:43 + Uploading drm-snapshot (2.4.1+git+20081116+930c0e7-1) experimental; urgency=low Changes since drm-snapshot-2.3.1+git+20081027+1d930fc-1: Alex Deucher (2): radeon: fix some fallout from the busmaster disable cleanup radeon: fix error in busmaster enable logic Ben Skeggs (2): nv50: move context-related tables a separate header file nv50: symlink nv50_grctx.h to linux-core... Chris Lamb (3): Merge branch 'upstream-experimental' into debian-experimental Update get-orig-source target for libdrm 2.4.1 Add changelog entries for 930c0e7. Eric Anholt (4): intel: Add dri_bufmgr_check_aperture support for bufmgr_gem. intel: Rename dri_ and intel_ symbols to drm_intel_. libdrm 2.4.1. intel: Restart on interrupt of bo_wait_rendering instead of complaining. Pekka Paalanen (2): drm: missing init_mm symbol, compatibility fix nouveau: compat fix for set_page_locked(). Robert Noland (1): i915: Since FreeBSD doesn't have gem support yet, don't advertise it. --- configure.ac |2 debian/changelog | 19 debian/rules |2 libdrm/intel/intel_bufmgr.c | 73 libdrm/intel/intel_bufmgr.h | 179 libdrm/intel/intel_bufmgr_fake.c | 369 - libdrm/intel/intel_bufmgr_gem.c | 449 + libdrm/intel/intel_bufmgr_priv.h | 65 linux-core/drm_compat.h | 28 linux-core/nouveau_sgdma.c |4 linux-core/nv50_grctx.h |1 shared-core/i915_dma.c |4 shared-core/i915_drm.h | 13 shared-core/nv50_graph.c | 8041 - shared-core/nv50_grctx.h | 9232 +++ shared-core/radeon_cp.c | 15 shared-core/radeon_drv.h | 10 17 files changed, 10008 insertions(+), 8498 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#504447: Additionnal info
Eric Valette wrote: I do explicitly want the 1.5.2 X server that is available in experimental and I also would like that the experimental package play nicely with other experimental packages There is no requirement that experimental packages play nicely with each other. There is not even a requirement that experimental packages play nicely at all. Sorry. Regards, -- ,''`. : :' : Chris Lamb `. `'` [EMAIL PROTECTED] `- signature.asc Description: PGP signature
xserver-xorg-video-nouveau: Changes to 'debian-experimental'
debian/changelog | 55 +++ debian/control|2 src/nouveau_channel.c |7 src/nouveau_xv.c | 13 src/nv30_exa.c| 29 + src/nv30_shaders.c| 126 ++- src/nv30_shaders.h|2 src/nv30_xv_tex.c | 11 src/nv40_exa.c| 32 + src/nv40_xv_tex.c | 11 src/nv_accel_common.c | 29 + src/nv_bios.c | 869 +- src/nv_crtc.c | 526 +- src/nv_driver.c | 264 ++- src/nv_hw.c | 314 +- src/nv_output.c | 115 ++ src/nv_proto.h| 26 - src/nv_setup.c| 124 +++ src/nv_type.h |5 src/nvreg.h | 219 20 files changed, 1382 insertions(+), 1397 deletions(-) New commits: commit ad485976ba8f7ad53197656eb183cb4ada78089a Author: Chris Lamb [EMAIL PROTECTED] Date: Tue Oct 28 07:48:06 2008 + Bump Build-Depends on libdrm-dev. Signed-off-by: Chris Lamb [EMAIL PROTECTED] diff --git a/debian/changelog b/debian/changelog index 78d509c..a022897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20081028+cea05e1-1) experimental; urgen - b175bfc... Bios register list is easier to read when sorted numerically - e51b49c... randr12: panels with edid have only a constant mode - 765494e... Remove unnecessary Setting owner message + * Bump Build-Depends on libdrm-dev. -- Chris Lamb [EMAIL PROTECTED] Tue, 28 Oct 2008 07:44:02 + diff --git a/debian/control b/debian/control index 1b335dd..4dc7b4b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Chris Lamb [EMAIL PROTECTED], Matthew Johnson [EMAIL PROTECTED] -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.3.1+git+20081012+f5327ac), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev +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.3.1+git+20081027+1d930fc), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev Standards-Version: 3.8.0 Homepage: http://nouveau.freedesktop.org/wiki/ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau commit 6a3088b06d70c137bc4b5d9c601c52383fcb3f77 Author: Chris Lamb [EMAIL PROTECTED] Date: Tue Oct 28 07:46:50 2008 + New upstream snapshot. Signed-off-by: Chris Lamb [EMAIL PROTECTED] diff --git a/debian/changelog b/debian/changelog index 6480e1a..78d509c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +xserver-xorg-video-nouveau (1:0.0.10~git+20081028+cea05e1-1) experimental; urgency=low + + * New upstream snapshot (Closes: #503541) +- cea05e1... randr12: make colour-map setting less complex +- 0e4b01a... randr12: convenience functions for vga crtc state access +- fe9bfd9... Tidy EnterVT, and don't call it from ScreenInit +- 3e1ccff... Condense crtc locking +- 83b541e... Common function for the bios condition table +- 36c6aa4... Allow more time in INIT_CONDITION_TIME (#18234) +- bf810b3... More warnings for C51's magical unaligned regs +- d481b5e... Rework bios parser error handling +- 387f308... RivaTuner dumps call the `how much memory have I got?' reg + NV_PFB_CSTATUS +- bb20175... pedantry fix for nv11 locking, and some minor cleanups +- 9aecc42... Add a function to lock/unlock all crtcs, use it in nv_bios + code +- 48581da... Attempt to make the usage of cr44 rational instead of + cargoculted +- 1c7bee9... Robust nv11 head setting (from mmiotrace) +- cf5162b... randr12: update scrn field on server regen, and emit an error + if rotated +- 13739cf... randr12: don't change virtualX/virtualY +- 98a4dcb... Delete notifiers and grobjs in CloseScreen to avoid channel + member becoming stale on server regeneration +- 12fce00... Remove all object with mmaps in CloseScreen, so that + drmClose actually calls the drm release method +- 8e3f27a... No reason to call AccelCommonInit twice in ScreenInit, but + calling it in EnterVT helps resume... +- f495fa9... nouveau_channel_free should remove mmaps made in + nouveau_channel_alloc +- 1cedb8e... Do frag prog allocation and shader upload in TCL init +- 9e2c089... Only hackup shaders once +- afc6668... cr26 is just another view of 0x3c0
xserver-xorg-video-nouveau: Changes to 'refs/tags/xserver-xorg-video-nouveau-0.0.10-git+20081028+cea05e1-1'
Tag 'xserver-xorg-video-nouveau-0.0.10-git+20081028+cea05e1-1' created by Chris Lamb [EMAIL PROTECTED] at 2008-10-28 07:56 + Releasing xserver-xorg-video-nouveau (1:0.0.10~git+20081028+cea05e1-1) experimental; urgency=low. Changes since xserver-xorg-video-nouveau-0.0.10-git+20081012+3b53f6c-1: Chris Lamb (3): Merge branch 'upstream-experimental' into debian-experimental New upstream snapshot. Bump Build-Depends on libdrm-dev. Stuart Bennett (37): Remove unnecessary Setting owner message randr12: panels with edid have only a constant mode Bios register list is easier to read when sorted numerically Improve some nv_bios messages, remove others Redo bios logging Make all CR 57/58 access use the proper functions and defines randr12: deBoolification and eliminate `override' arg to nv_crtc_load_state_ext randr12: remove pointless debug in nv_output and nv_crtc Eliminate separate NVRec ctor and dtor Replace a few memsets with initializers SaveGeneration isn't doing a lot Name crtc index regs according to rules.xml Rename relevant functions, sizes and offsets to PRM.IO from P.IO, in keeping with the nvidia scheme Convert CIO, DIO and VIO use to use defines from nvreg for index and data reg offsets Use symbolic define values where known cr26 is just another view of 0x3c0 Only hackup shaders once Do frag prog allocation and shader upload in TCL init nouveau_channel_free should remove mmaps made in nouveau_channel_alloc No reason to call AccelCommonInit twice in ScreenInit, but calling it in EnterVT helps resume... Remove all object with mmaps in CloseScreen, so that drmClose actually calls the drm release method Delete notifiers and grobjs in CloseScreen to avoid channel member becoming stale on server regeneration randr12: don't change virtualX/virtualY randr12: update scrn field on server regen, and emit an error if rotated Robust nv11 head setting (from mmiotrace) Attempt to make the usage of cr44 rational instead of cargoculted Add a function to lock/unlock all crtcs, use it in nv_bios code pedantry fix for nv11 locking, and some minor cleanups RivaTuner dumps call the `how much memory have I got?' reg NV_PFB_CSTATUS Rework bios parser error handling More warnings for C51's magical unaligned regs Allow more time in INIT_CONDITION_TIME (#18234) Common function for the bios condition table Condense crtc locking Tidy EnterVT, and don't call it from ScreenInit randr12: convenience functions for vga crtc state access randr12: make colour-map setting less complex --- debian/changelog | 55 +++ debian/control|2 src/nouveau_channel.c |7 src/nouveau_xv.c | 13 src/nv30_exa.c| 29 + src/nv30_shaders.c| 126 ++- src/nv30_shaders.h|2 src/nv30_xv_tex.c | 11 src/nv40_exa.c| 32 + src/nv40_xv_tex.c | 11 src/nv_accel_common.c | 29 + src/nv_bios.c | 869 +- src/nv_crtc.c | 526 +- src/nv_driver.c | 264 ++- src/nv_hw.c | 314 +- src/nv_output.c | 115 ++ src/nv_proto.h| 26 - src/nv_setup.c| 124 +++ src/nv_type.h |5 src/nvreg.h | 219 20 files changed, 1382 insertions(+), 1397 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
src/nouveau_channel.c |7
src/nouveau_xv.c | 13
src/nv30_exa.c| 29 +
src/nv30_shaders.c| 126 ++-
src/nv30_shaders.h|2
src/nv30_xv_tex.c | 11
src/nv40_exa.c| 32 +
src/nv40_xv_tex.c | 11
src/nv_accel_common.c | 29 +
src/nv_bios.c | 869 +-
src/nv_crtc.c | 526 +-
src/nv_driver.c | 264 ++-
src/nv_hw.c | 314 +-
src/nv_output.c | 115 ++
src/nv_proto.h| 26 -
src/nv_setup.c| 124 +++
src/nv_type.h |5
src/nvreg.h | 219
18 files changed, 1326 insertions(+), 1396 deletions(-)
New commits:
commit cea05e14f94dcb842adbfcec515e17e9f5655089
Author: Stuart Bennett [EMAIL PROTECTED]
Date: Sun Oct 26 03:51:36 2008 +
randr12: make colour-map setting less complex
diff --git a/src/nv_crtc.c b/src/nv_crtc.c
index c069b57..59db4be 100644
--- a/src/nv_crtc.c
+++ b/src/nv_crtc.c
@@ -1060,48 +1060,47 @@ static void nv_crtc_unlock(xf86CrtcPtr crtc)
{
}
+#define DEPTH_SHIFT(val, w) ((val (8 - w)) | (val ((w 1) - 8)))
+
static void
nv_crtc_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
int size)
{
struct nouveau_crtc *nv_crtc = to_nouveau_crtc(crtc);
- ScrnInfoPtr pScrn = crtc-scrn;
- NVPtr pNv = NVPTR(pScrn);
- NVCrtcRegPtr regp = pNv-ModeReg.crtc_reg[nv_crtc-head];
- int i, j;
+ NVPtr pNv = NVPTR(crtc-scrn);
+ struct rgb { uint8_t r, g, b; } __attribute__((packed)) *rgbs;
+ int i;
- switch (pScrn-depth) {
+ rgbs = (struct rgb *)pNv-ModeReg.crtc_reg[nv_crtc-head].DAC;
+
+ switch (crtc-scrn-depth) {
case 15:
/* R5G5B5 */
- /* We've got 5 bit (32 values) colors and 256 registers for
each color */
- for (i = 0; i 32; i++)
- for (j = 0; j 8; j++) {
- regp-DAC[(i*8 + j) * 3 + 0] = red[i] 8;
- regp-DAC[(i*8 + j) * 3 + 1] = green[i] 8;
- regp-DAC[(i*8 + j) * 3 + 2] = blue[i] 8;
- }
+ /* spread 5 bits per colour (32 colours) over 256 (per colour)
registers */
+ for (i = 0; i 32; i++) {
+ rgbs[DEPTH_SHIFT(i, 5)].r = red[i] 8;
+ rgbs[DEPTH_SHIFT(i, 5)].g = green[i] 8;
+ rgbs[DEPTH_SHIFT(i, 5)].b = blue[i] 8;
+ }
break;
case 16:
/* R5G6B5 */
- /* First deal with the 5 bit colors */
- for (i = 0; i 32; i++)
- for (j = 0; j 8; j++) {
- regp-DAC[(i*8 + j) * 3 + 0] = red[i] 8;
- regp-DAC[(i*8 + j) * 3 + 2] = blue[i] 8;
+ for (i = 0; i 64; i++) {
+ /* set 64 regs for green's 6 bits of colour */
+ rgbs[DEPTH_SHIFT(i, 6)].g = green[i] 8;
+ if (i 32) {
+ rgbs[DEPTH_SHIFT(i, 5)].r = red[i] 8;
+ rgbs[DEPTH_SHIFT(i, 5)].b = blue[i] 8;
}
- /* Now deal with the 6 bit color */
- for (i = 0; i 64; i++)
- for (j = 0; j 4; j++)
- regp-DAC[(i*4 + j) * 3 + 1] = green[i] 8;
+ }
break;
default:
/* R8G8B8 */
for (i = 0; i 256; i++) {
- regp-DAC[i * 3] = red[i] 8;
- regp-DAC[(i * 3) + 1] = green[i] 8;
- regp-DAC[(i * 3) + 2] = blue[i] 8;
+ rgbs[i].r = red[i] 8;
+ rgbs[i].g = green[i] 8;
+ rgbs[i].b = blue[i] 8;
}
- break;
}
nv_crtc_load_state_palette(crtc, pNv-ModeReg);
commit 0e4b01a5e06d8b5323c010ce89723369f17b10b2
Author: Stuart Bennett [EMAIL PROTECTED]
Date: Sat Oct 25 02:11:37 2008 +0100
randr12: convenience functions for vga crtc state access
diff --git a/src/nv_crtc.c b/src/nv_crtc.c
index 10ee1d6..c069b57 100644
--- a/src/nv_crtc.c
+++ b/src/nv_crtc.c
@@ -70,6 +70,19 @@ static void NVCrtcWriteRAMDAC(xf86CrtcPtr crtc, uint32_t
reg, uint32_t val)
NVWriteRAMDAC(pNv, nv_crtc-head, reg, val);
}
+static void crtc_rd_cio_state(xf86CrtcPtr crtc, NVCrtcRegPtr crtcstate, int
index)
+{
+ crtcstate-CRTC[index] = NVReadVgaCrtc(NVPTR(crtc-scrn),
+ to_nouveau_crtc(crtc)-head,
+ index);
+}
+
+static void crtc_wr_cio_state(xf86CrtcPtr crtc, NVCrtcRegPtr crtcstate, int
Bug#503541: xserver-xorg-video-nouveau: Xserver fails to start (wrong DRM version)
Massis Sirapian wrote: Having updated drm modules today, I've discovered that xserver-nouveau is now out-dated (drm modules of 20081015). That's right - there were some issues with drm-snapshot which needed to fixed first before xserver-nouveau could really be uploaded. May you update the xserver-xorg-video-nouveau package to match the drm-modules? Sure. I've just uploaded drm-snapshot and once I see that built on a few architectures I'll upload another nouveau snapshot. Regards, -- ,''`. : :' : Chris Lamb `. `'` [EMAIL PROTECTED] `- signature.asc Description: PGP signature
drm-snapshot: Changes to 'upstream-experimental'
bsd-core/drm_drv.c |2 +-
bsd-core/drm_fops.c |2 +-
bsd-core/drm_lock.c | 10 --
libdrm/intel/intel_bufmgr_fake.c | 17 +
libdrm/intel/intel_bufmgr_gem.c |2 +-
shared-core/i915_dma.c |2 +-
6 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 1d930fc75b99a89fc77d35d8f95f2877cfd5d7f0
Author: Matthias Hopf [EMAIL PROTECTED]
Date: Sat Oct 25 12:11:44 2008 -0400
drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831)
Olaf Kirch noticed that the i915_set_status_page() function of the i915
kernel driver calls ioremap with an address offset that is supplied by
userspace via ioctl. The function zeroes the mapped memory via memset
and tells the hardware about the address. Turns out that access to that
ioctl is not restricted to root so users could probably exploit that to
do nasty things. We haven't tried to write actual exploit code though.
It only affects the Intel G33 series and newer.
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 619e6ac..93bfcba 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -1225,7 +1225,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE, i915_vblank_pipe_get, DRM_AUTH
),
DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
DRM_IOCTL_DEF(DRM_I915_MMIO, i915_mmio, DRM_AUTH),
- DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),
+ DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page,
DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
#ifdef I915_HAVE_BUFFER
DRM_IOCTL_DEF(DRM_I915_EXECBUFFER, i915_execbuffer, DRM_AUTH),
#endif
commit b7d54b1dba8eba24da1b9cdd2116a26b98365b81
Author: Xiang, Haihao [EMAIL PROTECTED]
Date: Fri Oct 24 16:35:00 2008 +0800
intel: Also total child_size of the target_bos. Partial fix #17964.
diff --git a/libdrm/intel/intel_bufmgr_fake.c b/libdrm/intel/intel_bufmgr_fake.c
index c82ce5a..c9545b3 100644
--- a/libdrm/intel/intel_bufmgr_fake.c
+++ b/libdrm/intel/intel_bufmgr_fake.c
@@ -1193,9 +1193,10 @@ dri_fake_emit_reloc(dri_bo *reloc_buf,
dri_fake_bo_reference_locked(target_buf);
- if (!target_fake-is_static)
+ if (!target_fake-is_static) {
reloc_fake-child_size += ALIGN(target_buf-size,
target_fake-alignment);
-
+ reloc_fake-child_size += target_fake-child_size;
+ }
r-target_buf = target_buf;
r-offset = offset;
r-last_target_offset = target_buf-offset;
commit 8256c347cc80db0371b40b34ee8a163908d50079
Author: Robert Noland [EMAIL PROTECTED]
Date: Thu Oct 23 15:46:32 2008 -0400
[FreeBSD] We should use dev2unit() rather than minor()
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 725e5a9..afcad19 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -534,7 +534,7 @@ int drm_open(struct cdev *kdev, int flags, int fmt,
DRM_STRUCTPROC *p)
struct drm_device *dev = NULL;
int retcode = 0;
- dev = DRIVER_SOFTC(minor(kdev));
+ dev = DRIVER_SOFTC(dev2unit(kdev));
DRM_DEBUG(open_count = %d\n, dev-open_count);
diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c
index c6a8d19..e4cf846 100644
--- a/bsd-core/drm_fops.c
+++ b/bsd-core/drm_fops.c
@@ -41,7 +41,7 @@ int drm_open_helper(struct cdev *kdev, int flags, int fmt,
DRM_STRUCTPROC *p,
struct drm_device *dev)
{
struct drm_file *priv;
- int m = minor(kdev);
+ int m = dev2unit(kdev);
int retcode;
if (flags O_EXCL)
commit 7dbeb18777a4dc1e7eb3c6bc4da3e72456afc8fc
Author: Robert Noland [EMAIL PROTECTED]
Date: Thu Oct 23 15:42:49 2008 -0400
[FreeBSD] This check isn't correct and causes at least mga to lockup.
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index 685b0ea..dec7281 100644
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
@@ -102,17 +102,15 @@ int drm_unlock(struct drm_device *dev, void *data, struct
drm_file *file_priv)
{
struct drm_lock *lock = data;
+ DRM_DEBUG(%d (pid %d) requests unlock (0x%08x), flags = 0x%08x\n,
+ lock-context, DRM_CURRENTPID, dev-lock.hw_lock-lock,
+ lock-flags);
+
if (lock-context == DRM_KERNEL_CONTEXT) {
DRM_ERROR(Process %d using kernel context %d\n,
DRM_CURRENTPID, lock-context);
return EINVAL;
}
- /* Check that the context unlock being requested actually matches
-* who currently holds the lock.
-*/
- if (!_DRM_LOCK_IS_HELD(dev-lock.hw_lock-lock) ||
- _DRM_LOCKING_CONTEXT(dev-lock.hw_lock-lock) != lock-context)
- return EINVAL;
DRM_SPINLOCK(dev-tsk_lock);
if (dev-locked_task_call != NULL) {
commit a59ea02ff839fa0801763a90beb8b232b933c746
Author: Keith Packard [EMAIL PROTECTED]
Date: Thu Oct 16 21:15:01 2008 -0700
drm-snapshot: Changes to 'debian-experimental'
bsd-core/drm_drv.c |2 +-
bsd-core/drm_fops.c |2 +-
bsd-core/drm_lock.c | 10 --
debian/changelog | 20
debian/control | 15 ---
debian/control.modules.in|2 +-
libdrm/intel/intel_bufmgr_fake.c | 17 +
libdrm/intel/intel_bufmgr_gem.c |2 +-
shared-core/i915_dma.c |2 +-
9 files changed, 46 insertions(+), 26 deletions(-)
New commits:
commit 815c43bece7c32708d91c1f8f8dad708aa790a44
Author: Chris Lamb [EMAIL PROTECTED]
Date: Mon Oct 27 01:39:52 2008 +
Add ${misc:Depends} to libdrm-dev package dependencies.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 5620109..03a2f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ drm-snapshot (2.3.1+git+20081027+1d930fc-1) experimental;
urgency=low
installation failure now that /usr/share/modass is in drm-modules-source
instead of libdrm2. (Closes: #503154)
* Add reference to rendering on short descriptions. (Closes: #503192)
+ * Add ${misc:Depends} to libdrm-dev package dependencies.
-- Chris Lamb [EMAIL PROTECTED] Mon, 27 Oct 2008 01:03:23 +
diff --git a/debian/control b/debian/control
index 0c1467b..2ab90ab 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser:
http://git.debian.org/?=pkg-xorg/lib/drm-snapshot.git
Package: libdrm-dev
Section: libdevel
Architecture: any
-Depends: libdrm2 (= ${binary:Version})
+Depends: libdrm2 (= ${binary:Version}), ${misc:Depends}
Description: Userspace interface to kernel rendering services (snapshot) --
dev files
This library implements the userspace interface to the kernel DRM services.
DRM stands for Direct Rendering Manager, which is the kernelspace portion
commit 8e7b62676f2c0b4a3099d5afcd3929c19474b937
Author: Chris Lamb [EMAIL PROTECTED]
Date: Mon Oct 27 01:36:48 2008 +
Add reference to rendering on short descriptions. (Closes: #503192)
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 0e5a8f6..5620109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ drm-snapshot (2.3.1+git+20081027+1d930fc-1) experimental;
urgency=low
* drm-modules-source: Add versioned Replaces on libdrm2 to prevent
installation failure now that /usr/share/modass is in drm-modules-source
instead of libdrm2. (Closes: #503154)
+ * Add reference to rendering on short descriptions. (Closes: #503192)
-- Chris Lamb [EMAIL PROTECTED] Mon, 27 Oct 2008 01:03:23 +
diff --git a/debian/control b/debian/control
index 808f4cb..0c1467b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: libdrm-dev
Section: libdevel
Architecture: any
Depends: libdrm2 (= ${binary:Version})
-Description: Userspace interface to kernel DRM services (Development snapshot)
-- dev files
+Description: Userspace interface to kernel rendering services (snapshot) --
dev files
This library implements the userspace interface to the kernel DRM services.
DRM stands for Direct Rendering Manager, which is the kernelspace portion
of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -29,7 +29,7 @@ Package: libdrm2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Userspace interface to kernel DRM services (Development snapshot)
-- runtime
+Description: Userspace interface to kernel rendering services (snapshot) --
runtime
This library implements the userspace interface to the kernel DRM services.
DRM stands for Direct Rendering Manager, which is the kernelspace portion
of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -46,7 +46,7 @@ Section: libdevel
Priority: extra
Architecture: any
Depends: libdrm2 (= ${binary:Version}), ${misc:Depends}
-Description: Userspace interface to kernel DRM services (snapshot) --
debugging symbols
+Description: Userspace interface to kernel rendering services (snapshot) --
debug symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for Direct Rendering Manager, which is the kernelspace portion
of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -62,7 +62,7 @@ Package: libdrm-intel1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Userspace interface to intel-specific kernel DRM services --
runtime
+Description: Userspace interface to Intel-specific kernel rendering services
-- runtime
This library implements the userspace interface to the intel-specific kernel
DRM services. DRM stands for Direct Rendering Manager, which is the
kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
@@ -77,7 +77,7 @@ Section: libdevel
Priority: extra
Architecture
drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.3.1+git+20081027+1d930fc-1'
Tag 'drm-snapshot-2.3.1+git+20081027+1d930fc-1' created by Chris Lamb [EMAIL
PROTECTED] at 2008-10-27 01:42 +
drm-snapshot (2.3.1+git+20081027+1d930fc-1)
Changes since drm-snapshot-2.3.1+git+20081012+f5327ac-1:
Alex Deucher (4):
radeon: Add support for HD2100 IGP (RS740)
radeon: fix bus master enabled bits on newer asics
radeon: fix duplicate define in my last commit
radeon: add comment to clarify bus mastering on PCIE chips
Arjan van de Ven (1):
Apply a few stylistic cleanups to match kernel code.
Ben Skeggs (6):
nouveau: interface changes for nv5x 3d
nv50: add support for chipset 0x92
nv50: add ctxprog for chipset 0xaa
nv50: add ctxprog for chipset 0x50
nv50: add initial context to match ctxprog for chipset 0x50
nv50: add initial context for chipset 0xaa
Chris Lamb (11):
Drop 02_link.diff now that it is merged upstream (d9c2f65dd..)
New upstream snapshot.
Bump debhelper dependency in drm-modules-source binary package to match
source package.
Merge branch 'upstream-experimental' into debian-experimental
Create /usr/share/modass/packages in drm-modules-source.dirs instead of
libdrm2.dirs.
Releasing drm-snapshot 2.3.1+git+20081015+458e2d5-1
New upstream snapshot (1d930fc..)
Merge branch 'upstream-experimental' into debian-experimental
drm-modules-source: Add versioned Replaces on libdrm2
Add reference to rendering on short descriptions. (Closes: #503192)
Add ${misc:Depends} to libdrm-dev package dependencies.
Coleman Kane (1):
Change prototype of drmIoctl to unsigned long request.
Dave Airlie (21):
drm/pcigart: fix warning
drm: add fix for PAT on radeon with 2.6.26
drm: fix missing symbol export
drm/radeon: fixup 0 vs NULL
radeon: remove microcode version
radeon: fix type DST vs Z cache flush
radeon: fix typo with a better typo
drm: don't set the signal blocker on the master process.
i915: add version checks for opregion on old kernels
i915: more version checks
drm: add fault handler support so as to be more like possible upstream
Revert i915: Move all of the irq install/uninstall to load time.
drm: TRUE/true
drm: add OS_HAS_GEM option.
drm_vm: fix for build on 2.6.22
libdrm: add udev support.
radeon: make writeback work after suspend/resume.
drm: fix sysfs error path.
drm: add create gpu tree script
radeon: PCIE cards don't appear to have explicit bus master
libdrm: don't depend or link to libdrm_intel
Eric Anholt (112):
Clarify that drm_agp_ttm_backend is associated with a drm_ttm.
Initial add of mmfs module.
Move mmfs.h userland interface to shared-core.
Extend the mmfs basic test to do a couple of ioctls.
Add pread/pwrite ioctls to mmfs.
Add mmap ioctl to mmfs.
Rename drm_mm.c and its fuctions to drm_memrange.
Move mmfs ioctls into the DRM. Untested.
Move mmfs tests over to be drm tests.
Remove the remainder of the mmfs device.
Hacking towards hooking up execbuffer.
checkpoint: rename to GEM and a few more i915 bits.
checkpoint: gtt binding written.
checkpoint: relocations support.
Add pin/unpin object ioctls for gem.
Remove _args from gem ioctl argument structure tags.
Update mm tests for GEM rename.
Make GEM object handles be nonzero.
Fix missing member settings in obj/obj_priv, and some error paths.
Fix offset passed to AGP to be pages instead of bytes.
Unbind objects when freeing, fix some error paths, and warn in others.
Don't include the tail guard memrange in foreach callbacking.
Don't forget to set the memrange private, and reset ring on kernel entry.
GEM: Replace drm_memrange_for_each with just evicting what we brought in.
GEM: Save the last ioremapped page for relocations in case we need it
again.
GEM: Skip relocation if presumed offset matches.
GEM: Use irq-based fencing rather than syncing and evicting every exec.
GEM: Extend cache domain stuff for 965.
GEM: Wait for existing rendering to complete before writing relocation
data.
GEM: fix testcases for new ioctl args.
GEM: Fix oops on NULL dereference when we try clflushing when we don't
need to.
GEM: Avoid leaking refs on target objects on presumed offset success.
GEM: Clear obj_priv-agp_mem when we free it.
GEM: Separate the LRU into execution list and LRU list.
GEM: Fix arguments to drm_memrange_init so we don't exceed our allocation.
[GEM] Typo (and thinking) fixes in drm-gem.txt and doxygen.
[GEM] Update testcases for new API.
[gem] typo fix in comment.
[gem] Rename the GTT LRU lists to active (executing) and inactive (idle).
[gem] Hold dev-struct_mutex to protect structure data.
[gem] Clean up active/inactive list
drm-snapshot: Changes to 'upstream-experimental'
libdrm/Makefile.am |3 +--
libdrm/intel/Makefile.am |1 +
libdrm/intel/intel_bufmgr.c | 10 ++
libdrm/intel/intel_bufmgr.h |2 ++
libdrm/intel/intel_bufmgr_fake.c | 20
libdrm/intel/intel_bufmgr_gem.c | 23 +++
libdrm/intel/intel_bufmgr_priv.h |9 +
7 files changed, 58 insertions(+), 10 deletions(-)
New commits:
commit 458e2d5bc5f949d00cfcc9a3f9ce89f0c9f5628c
Author: Eric Anholt [EMAIL PROTECTED]
Date: Tue Oct 14 13:33:38 2008 -0700
intel: Fix compile warning.
diff --git a/libdrm/intel/intel_bufmgr_fake.c b/libdrm/intel/intel_bufmgr_fake.c
index cfe9a73..8e476c4 100644
--- a/libdrm/intel/intel_bufmgr_fake.c
+++ b/libdrm/intel/intel_bufmgr_fake.c
@@ -732,7 +732,6 @@ static void
dri_fake_bo_wait_rendering(dri_bo *bo)
{
dri_bufmgr_fake *bufmgr_fake = (dri_bufmgr_fake *)bo-bufmgr;
- dri_bo_fake *bo_fake = (dri_bo_fake *)bo;
pthread_mutex_lock(bufmgr_fake-lock);
dri_fake_bo_wait_rendering_locked(bo);
commit 993383873c215ab11975d98b93f131a4e3ea7ce6
Author: Eric Anholt [EMAIL PROTECTED]
Date: Tue Oct 14 13:18:11 2008 -0700
intel: Add interface for getting tiling mode of a bo.
diff --git a/libdrm/intel/intel_bufmgr.c b/libdrm/intel/intel_bufmgr.c
index fc7284b..92b6046 100644
--- a/libdrm/intel/intel_bufmgr.c
+++ b/libdrm/intel/intel_bufmgr.c
@@ -192,3 +192,13 @@ int dri_bo_set_tiling(dri_bo *bo, uint32_t *tiling_mode)
*tiling_mode = I915_TILING_NONE;
return 0;
}
+
+int dri_bo_get_tiling(dri_bo *bo, uint32_t *tiling_mode, uint32_t
*swizzle_mode)
+{
+if (bo-bufmgr-bo_get_tiling)
+ return bo-bufmgr-bo_get_tiling(bo, tiling_mode, swizzle_mode);
+
+*tiling_mode = I915_TILING_NONE;
+*swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
+return 0;
+}
diff --git a/libdrm/intel/intel_bufmgr.h b/libdrm/intel/intel_bufmgr.h
index c44d596..0c7b0e4 100644
--- a/libdrm/intel/intel_bufmgr.h
+++ b/libdrm/intel/intel_bufmgr.h
@@ -87,6 +87,8 @@ int dri_bo_emit_reloc(dri_bo *reloc_buf,
int dri_bo_pin(dri_bo *buf, uint32_t alignment);
int dri_bo_unpin(dri_bo *buf);
int dri_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
+int dri_bo_get_tiling(dri_bo *buf, uint32_t *tiling_mode,
+ uint32_t *swizzle_mode);
int dri_bo_flink(dri_bo *buf, uint32_t *name);
/* intel_bufmgr_gem.c */
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index 9bd4441..33853c4 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -873,6 +873,28 @@ dri_gem_bo_set_tiling(dri_bo *bo, uint32_t *tiling_mode)
}
static int
+dri_gem_bo_get_tiling(dri_bo *bo, uint32_t *tiling_mode, uint32_t
*swizzle_mode)
+{
+dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo-bufmgr;
+dri_bo_gem *bo_gem = (dri_bo_gem *)bo;
+struct drm_i915_gem_get_tiling get_tiling;
+int ret;
+
+get_tiling.handle = bo_gem-gem_handle;
+
+ret = ioctl(bufmgr_gem-fd, DRM_IOCTL_I915_GEM_GET_TILING, get_tiling);
+if (ret != 0) {
+ *tiling_mode = I915_TILING_NONE;
+ *swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
+ return -errno;
+}
+
+*tiling_mode = get_tiling.tiling_mode;
+*swizzle_mode = get_tiling.swizzle_mode;
+return 0;
+}
+
+static int
dri_gem_bo_flink(dri_bo *bo, uint32_t *name)
{
dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo-bufmgr;
@@ -959,6 +981,7 @@ intel_bufmgr_gem_init(int fd, int batch_size)
bufmgr_gem-bufmgr.bo_emit_reloc = dri_gem_bo_emit_reloc;
bufmgr_gem-bufmgr.bo_pin = dri_gem_bo_pin;
bufmgr_gem-bufmgr.bo_unpin = dri_gem_bo_unpin;
+bufmgr_gem-bufmgr.bo_get_tiling = dri_gem_bo_get_tiling;
bufmgr_gem-bufmgr.bo_set_tiling = dri_gem_bo_set_tiling;
bufmgr_gem-bufmgr.bo_flink = dri_gem_bo_flink;
bufmgr_gem-bufmgr.bo_exec = dri_gem_bo_exec;
diff --git a/libdrm/intel/intel_bufmgr_priv.h b/libdrm/intel/intel_bufmgr_priv.h
index 7f39bfc..cbf3b31 100644
--- a/libdrm/intel/intel_bufmgr_priv.h
+++ b/libdrm/intel/intel_bufmgr_priv.h
@@ -150,6 +150,15 @@ struct _dri_bufmgr {
*/
int (*bo_set_tiling) (dri_bo *bo, uint32_t *tiling_mode);
/**
+ * Get the current tiling (and resulting swizzling) mode for the bo.
+ *
+ * \param buf Buffer to get tiling mode for
+ * \param tiling_mode returned tiling mode
+ * \param swizzle_mode returned swizzling mode
+ */
+int (*bo_get_tiling) (dri_bo *bo, uint32_t *tiling_mode,
+ uint32_t *swizzle_mode);
+/**
* Create a visible name for a buffer which can be used by other apps
*
* \param buf Buffer to create a name for
commit d9c2f65dd8e50736a33e97a55c257ef6843e1ce7
Author: Julien Cristau [EMAIL PROTECTED]
Date: Tue Oct 14 01:25:57 2008 +0200
link libdrm_intel properly
libdrm_intel needs symbols from libdrm, so link against it.
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index dbe58fb..63f6e64 100644
---
drm-snapshot: Changes to 'debian-experimental'
debian/changelog | 17 +++--
debian/control |2 +-
debian/drm-modules-source.dirs |1 +
debian/libdrm2.dirs |1 -
debian/patches/02_link.diff | 39 ---
debian/patches/series|1 -
libdrm/Makefile.am |3 +--
libdrm/intel/Makefile.am |1 +
libdrm/intel/intel_bufmgr.c | 10 ++
libdrm/intel/intel_bufmgr.h |2 ++
libdrm/intel/intel_bufmgr_fake.c | 20
libdrm/intel/intel_bufmgr_gem.c | 23 +++
libdrm/intel/intel_bufmgr_priv.h |9 +
13 files changed, 75 insertions(+), 54 deletions(-)
New commits:
commit dc7981759a1669a08c5227fd4c840d132b32e33c
Author: Chris Lamb [EMAIL PROTECTED]
Date: Wed Oct 15 01:21:21 2008 +0100
Releasing drm-snapshot 2.3.1+git+20081015+458e2d5-1
Many thanks to Julien Cristau for advice and patience.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index e521f2c..0024445 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-drm-snapshot (2.3.1+git+20081015+458e2d5-1) UNRELEASED; urgency=low
+drm-snapshot (2.3.1+git+20081015+458e2d5-1) experimental; urgency=low
[ Julien Cristau ]
* Fixup the merge of upstream git on the debian branch.
@@ -26,7 +26,7 @@ drm-snapshot (2.3.1+git+20081015+458e2d5-1) UNRELEASED;
urgency=low
* Create /usr/share/modass/packages in drm-modules-source.dirs instead of
libdrm2.dirs.
- -- Chris Lamb [EMAIL PROTECTED] Wed, 15 Oct 2008 01:04:32 +0100
+ -- Chris Lamb [EMAIL PROTECTED] Wed, 15 Oct 2008 01:20:26 +0100
drm-snapshot (2.3.1+git+20081012+f5327ac-1) experimental; urgency=low
commit f52d12947db3999b103275fefdd75e4823df325c
Author: Chris Lamb [EMAIL PROTECTED]
Date: Wed Oct 15 01:16:44 2008 +0100
Create /usr/share/modass/packages in drm-modules-source.dirs instead of
libdrm2.dirs.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 46e9ba5..e521f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ drm-snapshot (2.3.1+git+20081015+458e2d5-1) UNRELEASED;
urgency=low
- c6109df... libdrm: don't depend or link to libdrm_intel
* Bump debhelper dependency in drm-modules-source binary package to match
source package.
+ * Create /usr/share/modass/packages in drm-modules-source.dirs instead of
+libdrm2.dirs.
-- Chris Lamb [EMAIL PROTECTED] Wed, 15 Oct 2008 01:04:32 +0100
diff --git a/debian/drm-modules-source.dirs b/debian/drm-modules-source.dirs
index b601f22..a7360b8 100644
--- a/debian/drm-modules-source.dirs
+++ b/debian/drm-modules-source.dirs
@@ -1 +1,2 @@
usr/src
+usr/share/modass/packages
diff --git a/debian/libdrm2.dirs b/debian/libdrm2.dirs
index 551faf3..6845771 100644
--- a/debian/libdrm2.dirs
+++ b/debian/libdrm2.dirs
@@ -1,2 +1 @@
usr/lib
-usr/share/modass/packages
commit cef6275af90e80cacb25da96dedfb2a40251f095
Author: Chris Lamb [EMAIL PROTECTED]
Date: Wed Oct 15 01:10:46 2008 +0100
Bump debhelper dependency in drm-modules-source binary package to match
source package.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 7e76630..46e9ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ drm-snapshot (2.3.1+git+20081015+458e2d5-1) UNRELEASED;
urgency=low
- d9c2f65... link libdrm_intel properly
- 3e03d78... intel: Avoid pthread mutex recursion in bufmgr_fake.
- c6109df... libdrm: don't depend or link to libdrm_intel
+ * Bump debhelper dependency in drm-modules-source binary package to match
+source package.
-- Chris Lamb [EMAIL PROTECTED] Wed, 15 Oct 2008 01:04:32 +0100
diff --git a/debian/control b/debian/control
index e55c09b..65f7696 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Description: Userspace interface to intel-specific kernel DRM
services -- debugg
Package: drm-modules-source
Architecture: all
-Depends: debhelper (= 5), quilt, make, git-core, module-assistant,
${misc:Depends}
+Depends: debhelper (= 7), quilt, make, git-core, module-assistant,
${misc:Depends}
Suggests: kernel-package, linux-headers | linux-source
Description: Source for the drm kernel modules
This package provides the source code for the DRM kernel modules. The DRM
commit 2a6dd5daa082d2335286404559fd848852bbcf0d
Author: Chris Lamb [EMAIL PROTECTED]
Date: Wed Oct 15 01:05:26 2008 +0100
New upstream snapshot.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 569191d..7e76630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-drm-snapshot (2.3.1+git+20081012+f5327ac-2) UNRELEASED; urgency=low
+drm-snapshot (2.3.1+git+20081015+458e2d5-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Fixup
drm-snapshot: Changes to 'upstream-experimental'
.gitignore |4 bsd-core/ati_pcigart.c | 97 bsd-core/drmP.h | 357 - bsd-core/drm_agpsupport.c| 58 bsd-core/drm_atomic.h| 53 bsd-core/drm_auth.c | 19 bsd-core/drm_bufs.c | 323 - bsd-core/drm_context.c | 112 bsd-core/drm_dma.c | 33 bsd-core/drm_drawable.c | 39 bsd-core/drm_drv.c | 424 -- bsd-core/drm_fops.c | 91 bsd-core/drm_ioctl.c | 52 bsd-core/drm_irq.c | 196 - bsd-core/drm_linux_list.h|4 bsd-core/drm_lock.c | 163 bsd-core/drm_memory.c| 91 bsd-core/drm_pci.c | 48 bsd-core/drm_scatter.c | 34 bsd-core/drm_sysctl.c| 23 bsd-core/drm_vm.c| 37 bsd-core/i915_drv.c | 84 bsd-core/mach64_drv.c| 76 bsd-core/mga_drv.c | 91 bsd-core/r128_drv.c | 84 bsd-core/radeon_drv.c| 95 bsd-core/savage_drv.c| 68 bsd-core/sis_drv.c | 62 bsd-core/tdfx_drv.c | 49 bsd-core/via_drv.c | 82 configure.ac | 81 libdrm/Makefile.am |8 libdrm/intel/Makefile.am | 45 libdrm/intel/intel_bufmgr.c | 194 + libdrm/intel/intel_bufmgr.h | 127 libdrm/intel/intel_bufmgr_fake.c | 1518 +++ libdrm/intel/intel_bufmgr_gem.c | 974 + libdrm/intel/intel_bufmgr_priv.h | 165 libdrm/intel/mm.c| 281 + libdrm/intel/mm.h| 96 libdrm/libdrm_lists.h| 87 libdrm/xf86drm.c | 740 --- libdrm/xf86drm.h |3 libdrm/xf86mm.h | 12 linux-core/Makefile | 14 linux-core/Makefile.kernel |5 linux-core/drm-gem.txt | 805 linux-core/drmP.h| 159 linux-core/drm_agpsupport.c | 43 linux-core/drm_compat.h | 10 linux-core/drm_drv.c |8 linux-core/drm_fops.c|6 linux-core/drm_gem.c | 444 ++ linux-core/drm_irq.c | 41 linux-core/drm_lock.c| 33 linux-core/drm_memory.c |4 linux-core/drm_mm.c |2 linux-core/drm_objects.h |7 linux-core/drm_proc.c| 84 linux-core/drm_stub.c| 31 linux-core/drm_sysfs.c |2 linux-core/drm_ttm.c |6 linux-core/drm_vm.c |2 linux-core/i915_drv.c| 35 linux-core/i915_gem.c| 2502 + linux-core/i915_gem_debug.c | 202 + linux-core/i915_gem_proc.c | 293 + linux-core/i915_gem_tiling.c | 309 + linux-core/i915_opregion.c | 19 linux-core/nouveau_sgdma.c |8 scripts/create_lk_gpu.sh | 58 shared-core/drm.h| 33 shared-core/drm_pciids.txt | 48 shared-core/i915_dma.c | 285 + shared-core/i915_drm.h | 321 + shared-core/i915_drv.h | 327 + shared-core/i915_irq.c | 144 shared-core/mach64_dma.c |6 shared-core/nouveau_drm.h|2 shared-core/nouveau_drv.h| 13 shared-core/nouveau_fifo.c |4 shared-core/nouveau_object.c |7 shared-core/nouveau_state.c | 171 shared-core/nv20_graph.c | 32 shared-core/nv40_graph.c | 10 shared-core/nv50_graph.c | 7450 +++ shared-core/radeon_cp.c | 46 shared-core/radeon_drv.h | 29 tests/Makefile.am|6 tests/drmtest.c |2 tests/gem_basic.c| 98 tests/gem_flink.c| 128 tests/gem_mmap.c | 132 tests/gem_readwrite.c| 135 94 files changed, 18540 insertions(+), 3301 deletions(-) New commits: commit f5327aca0cbb1b602e4f954b8f361f2e1daaf20d Author: Robert Noland [EMAIL PROTECTED] Date: Fri Oct 10 18:23:11 2008 -0400 [FreeBSD] Plug memory leak in drm_rmdraw() and drm_drawable_free_all() diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c index 018db57..2ae11db 100644 --- a/bsd-core/drm_drawable.c +++ b/bsd-core/drm_drawable.c @@ -71,8 +71,8 @@ int drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv) struct drm_draw *draw = data; struct bsd_drm_drawable_info *info; - info = drm_calloc(1, sizeof(struct bsd_drm_drawable_info), - DRM_MEM_DRAWABLE); + info = malloc(sizeof(struct bsd_drm_drawable_info), DRM_MEM_DRAWABLE, + M_NOWAIT | M_ZERO); if (info == NULL) return ENOMEM; @@ -99,8 +99,8 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file
drm-snapshot: Changes to 'refs/tags/drm-snapshot-2.3.1+git+20081012+f5327ac-1'
Tag 'drm-snapshot-2.3.1+git+20081012+f5327ac-1' created by Chris Lamb [EMAIL PROTECTED] at 2008-10-12 19:44 + Tagging drm-snapshot (2.3.1+git+20081012+f5327ac-1) experimental; urgency=low Changes since 2.3.1+git+20080803+4585787-1: Ben Skeggs (1): nouveau: interface changes for nv5x 3d Chris Lamb (9): New upstream snapshot. Update my email address. Move to debhelper 7. Drop non-essential versioned dependencies that are satisfied in stable. Add dummy debian/watch file to appease lintian. Correct spelling errors in upstream changelog entries. Add libdrm_intel symbol to libdrm2.shlibs. Use non-hyphenated git-subcommand style to avoid problems with git 1.6. Add lintian override and justification for source-contains-git-control-dir. Dave Airlie (12): drm/pcigart: fix warning drm: add fix for PAT on radeon with 2.6.26 drm: fix missing symbol export drm/radeon: fixup 0 vs NULL radeon: remove microcode version radeon: fix type DST vs Z cache flush radeon: fix typo with a better typo drm: don't set the signal blocker on the master process. i915: add version checks for opregion on old kernels i915: more version checks drm: add fault handler support so as to be more like possible upstream Revert i915: Move all of the irq install/uninstall to load time. Hong Liu (1): This is a modified version of Hong's patch from last month, with a few Jesse Barnes (4): Avoid incorrect vblank wakeups i915: remove old broken vblank code Update vblank code to new API i915: convert to using drm_vblank_get/put around vblank counter usage Michel Dänzer (6): Remove obsolete dev-vblank_suspend[crtc] tests. vblank-rework rework cleanups. radeon: Post-vblank-rework-rework cleanups. Drop workaround for driver vblank counter going backwards. Reinstate dev-vblank_enabled[]. Remove accidental leftover tests. Nicolai Haehnle (2): r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX r300: Fix cliprect emit Owain Gordon Ainsworth (1): BSD: change drm_locked_task*() to use the same scheme as linux. Robert Noland (7): [FreeBSD] We aren't allowed to hold locks over bus_dma_tag_create or bus_dmamem_alloc. FreeBSD: Fix radeon build [FreeBSD] drm_irq.c updates for vblank fixes. [FreeBSD] Improve upper_32_bits define. i915: Move all of the irq install/uninstall to load time. [FreeBSD] Catch up to linux on vblank-rework [FreeBSD] Duh, we need to actually define the drm_modeset_ctl... Stefan Becker (1): radeon: Add suspend/resume hooks for saving/clearing/restoring interrupts. Stuart Bennett (2): nouveau: fix bad rename from 5a072f32c8f941d1ef301811881e8c89c8d8a5f1 nouveau: fix nv04 fifo context save to save reg contents, not reg offset martin capitanio (1): xgi: use true/false instead of TRUE/FALSE --- bsd-core/drmP.h | 10 - bsd-core/drm_drv.c |2 bsd-core/drm_irq.c | 169 - bsd-core/drm_lock.c |7 bsd-core/drm_pci.c |5 debian/changelog| 377 ++ debian/compat |2 debian/control |4 debian/control.modules.in |4 debian/libdrm2.shlibs |1 debian/rules|3 debian/source.lintian-overrides |4 debian/watch|1 linux-core/Makefile.kernel |3 linux-core/ati_pcigart.c|2 linux-core/drmP.h | 13 + linux-core/drm_compat.c | 99 ++ linux-core/drm_compat.h |7 linux-core/drm_irq.c| 141 +++--- linux-core/drm_lock.c | 21 +- linux-core/drm_memory.c |9 linux-core/drm_vm.c | 35 +-- linux-core/i915_drv.c |8 linux-core/i915_opregion.c | 388 linux-core/radeon_drv.c | 24 ++ linux-core/xgi_cmdlist.c|6 linux-core/xgi_drv.c|4 linux-core/xgi_misc.c | 26 +- shared-core/i915_dma.c |9 shared-core/i915_drv.h | 30 +++ shared-core/i915_irq.c | 116 --- shared-core/nouveau_drm.h | 20 +- shared-core/nouveau_drv.h |4 shared-core/nouveau_fifo.c |3 shared-core/nouveau_mem.c | 66 ++ shared-core/nv04_fifo.c |4 shared-core/r300_cmdbuf.c | 85 +++- shared-core/radeon_cp.c | 17 - shared-core/radeon_drv.h| 11 - shared-core/radeon_irq.c| 55 + shared-core/radeon_mem.c|8 shared-core/radeon_state.c | 30 +-- 42 files changed, 1434 insertions(+), 399 deletions(-) --- -- To UNSUBSCRIBE, email
xserver-xorg-video-nouveau: Changes to 'refs/tags/xserver-xorg-video-nouveau-0.0.10-git+20081012+3b53f6c-1'
Tag 'xserver-xorg-video-nouveau-0.0.10-git+20081012+3b53f6c-1' created by Chris
Lamb [EMAIL PROTECTED] at 2008-10-12 19:42 +
Tagging xserver-xorg-video-nouveau (1:0.0.10~git+20081012+3b53f6c-1)
experimental; urgency=low.
Changes since xserver-xorg-video-nouveau-0.0.10-git+20080803+30f54f2-1:
Ben Skeggs (3):
xv: fix thinko from when source was reformatted
nv50/exa: work around corruption issues (see detailed commit msg)
nv50: 0xa0 family uses class 0x8397 for 3D
Chris Lamb (7):
Merge branch 'upstream-experimental' into debian-experimental
New upstream snapshot.
Update maintainer email address.
Update build-dependency on libdrm-dev.
Add dummy debian/watch file to appease lintian.
Move to debhelper 7.
Rework long description to include a pointer to module-assistant
Maarten Maathuis (23):
NV50: Disable messages from hide, show and load cursor, as they clutter
the logs.
nv50: fix some of the rendering bugs
NV50: support extended i2c ports (4 and 5)
Forgot something.
NV50: a half decent attempt at doing something when LVDS has no DDC
NV50: extra warning message
NV50: disallow doublescan modes on TMDS/LVDS
nv50: clip SIFC and add {Prepare,Finish}Access hooks.
nv50: handle ROPs better
nv50: minor tweaks to composite
nv50: move VERTEX_{START,END} to {Prepare,Done}Composite
exa: FIRE_RING at the end of composite
nv10: composite is an async operation by default, no need to call
exaMarkSync().
nv50: do ROPs properly this time
nv50: micro cleanup
nv50: solid fill shouldn't use a pattern rop + minor changes
exa: align offscreenBase to something sensible
NV50: The TMDS dual link threshold is meaningless for LVDS
NV50: remove {Prepare,Finish}Access since i realise now it's not so useful
Also remove man page entry.
Some fixes that bring me closer to surviving to the 2nd X server
generation.
git-log is no longer valid for git 1.6, switch to git log.
The fifo channel should be removed along with closing of the fd, so only
clear the client memory.
Stephane Marchesin (5):
Fix a 16bpp issue, also remove old code that mostly worked around core
EXA issues in older xservers.
Fix IFC for 16bpp. Also fix the color accuracy of 16bpp solid fills.
Kill some 8 bit code.
Add 8200 detection.
Partly revert ea152819f45b6cf92f6742ed3f9f639cdbbd53f0, alignment is
needed.
Stuart Bennett (53):
Deal with mobile cards that scribble over the fp strap at POST
Try harder to load a good vbios image
Redo parsing for panels with EDID, and fix nv3x in the process (#17138)
Apply minimum front porch only when necessary (#15949)
randr12: for native scaling, a clock check isn't enough
randr12: improve aspect scaling code
randr12: fpWidth and fpHeight no more
randr12: remove another field member
NewRestore: remove, due to lack of interest
randr12: some code simplification, rearrangement and tidying
0x48 exception does not apply on BIT cards
randr12: a few line length improvements
Micro-tidyups to nv_driver and nouveau_xv
CrtcNumber option is long gone
Bye bye 8 bit depth
Delete ShadowFB rotation
NV_ARCH_04 can have rotated output, it's just not accelerated
Remove some of the inaccuracies in the manpage
randr12: don't cache pll values (fixes newrestore removal regression)
randr12: make the nouveau experience less green
Remove unused code
randr12: detypedef private structs and use a define to get to the privates
randr12: remember the edid from detection for getting modes later
randr12: merge output detection functions
Only use OF bios image on PPC
Another DCB 1.4/1.5 TV (#17471)
randr12: separate encoder struct
randr12: nouveau_output - nouveau_connector
randr12: unified entry path for dpms
randr12: unify output funcs for analogue and tmds
randr12: re-do detection of dvi-a vs vga
randr12: fix dpms, detect, destroy, save and restore for multiple
encoders per connector
randr12: avoid weirdness when tv-out happens to share i2c_index with
another output
randr12: multiple encoders per connector (DVI-I)
Need to increment dcb entry index when fabricating additional entries
randr12: crtc destroy
randr12: rename mon - edid
Optimizing memory usage for unaccelerated case is not interesting
Oops.
Reduce includes, everything necessary is in nv_include.h
randr12: distinguish detected encoder from active encoder
randr12: reorder nv_output functions
Better behaviour on allocator fail
randr12: don't use in use (by another vga output) crtc for load detect
(avoids flicker)
Wrap usleep when called in bios code
Reindent arbitration stuff
Some tidying
Bug#496134: drm-modules-source does not build with 2.6.26-1-amd64 (probably other 2.6.26-1 as well)
tags 496134 + pending thanks Hi, As I mentioned to a few people who enquired (privately) about this bug, I left this to temporarily rot as the upstream version at the time had--in my opinion--various regressions which made everyday usage significantly painful. However, I now plan to upload the latest version, regardless of its state. Regards, -- ,''`. : :' : Chris Lamb `. `'` [EMAIL PROTECTED] `- signature.asc Description: PGP signature
Bug#496134: drm-modules-source does not build with 2.6.26-1-amd64
Hi Don/Nicolas: Currently drm-modules-source does not build with 2.6.26-1-amd64; it probably needs to be upgraded to a newer version from git. Agreed. I had been delaying an upload due to some regressions in the Git version but this is probably a bad policy to continue for such an experimental driver. You need to add #define FALSE 0 #define TRUE 1 [..] After this ugly fix it works. I hope this get fixed in a better way in a future version. Heh, well, it is the same fix used by upstream so don't feel too bad about it. Anyway, I will prepare an upload.. Regards, -- Chris Lamb, UK [EMAIL PROTECTED] GPG: 0x634F9A20 signature.asc Description: PGP signature
drm-snapshot: Changes to 'debian-experimental'
debian/changelog | 56 +++ 1 file changed, 56 insertions(+) New commits: commit a151a3e9b3b1e4d2a52305097465854e83a97211 Author: Chris Lamb [EMAIL PROTECTED] Date: Sun Aug 3 17:19:26 2008 +0100 New upstream snapshot. Signed-off-by: Chris Lamb [EMAIL PROTECTED] diff --git a/debian/changelog b/debian/changelog index 3b7042f..70b5a2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,59 @@ +drm-snapshot (2.3.1+git+20080803+4585787-1) experimental; urgency=low + + * New upstream snapshot: +- 4585787... Revert i915: Move all of the irq install/uninstall to load + time. +- 10d5b03... drm: add fault handler support so as to be more like + possible upstream +- 95c0274... i915: more version checks +- 02b09d2... i915: add version checks for opregion on old kernels +- 90b90c6... r300: Fix cliprect emit +- 6b903f5... nouveau: fix nv04 fifo context save to save reg contents, + not reg offset +- 591f6bc... nouveau: fix bad rename from + 5a072f32c8f941d1ef301811881e8c89c8d8a5f1 +- 514c05c... radeon: Add suspend/resume hooks for + saving/clearing/restoring interrupts. +- c3d4638... r300_cmdbuf: Always emit INDX_BUFFER immediately after + DRAW_INDEX +- 7a3d662... [FreeBSD] Duh, we need to actually define the + drm_modeset_ctl... +- 50db5ae... drm: don't set the signal blocker on the master process. +- 2580a06... [FreeBSD] Catch up to linux on vblank-rework +- 965a722... i915: Move all of the irq install/uninstall to load time. +- 589f968... radeon: fix typo with a better typo +- c669489... radeon: fix type DST vs Z cache flush +- f57f01f... [FreeBSD] Improve upper_32_bits define. +- b5cddbc... Remove accidental leftover tests. +- 4be367b... Reinstate dev-vblank_enabled[]. +- f529a51... Drop workaround for driver vblank counter going backwards. +- e4feaf5... radeon: Post-vblank-rework-rework cleanups. +- 205aff6... vblank-rework rework cleanups. +- 014935b... Remove obsolete dev-vblank_suspend[crtc] tests. +- 04893aa... i915: convert to using drm_vblank_get/put around vblank + counter usage +- 6ac1f8a... Update vblank code to new API +- 7cfdba2... radeon: remove microcode version +- ed7e170... drm/radeon: fixup 0 vs NULL +- 480c317... [FreeBSD] drm_irq.c updates for vblank fixes. +- a9427cf... i915: remove old broken vblank code +- 2204f92... Avoid incorrect vblank wakeups +- b0e4619... FreeBSD: Fix radeon build +- 74cf1f9... BSD: change drm_locked_task*() to use the same scheme as + linux. +- 96580f6... [FreeBSD] We aren't allowed to hold locks over + bus_dma_tag_create or bus_dmamem_alloc. +- dfd441c... This is a modified version of Hong's patch from last month, + with a few +- 764573f... drm: fix missing symbol export +- abdd523... drm: add fix for PAT on radeon with 2.6.26 +- 76c8e19... drm/pcigart: fix warning +- eac0933... xgi: use true/false instead of TRUE/FALSE + + Fixes build under Linux 2.6.26. +- c7ed2c6... nouveau: interface changes for nv5x 3d + + -- Chris Lamb [EMAIL PROTECTED] Sun, 03 Aug 2008 17:13:24 +0100 + drm-snapshot (2.3.1+git+20080706+401f77a-1) experimental; urgency=low * New upstream snapshot: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
drm-snapshot: Changes to 'refs/tags/2.3.1+git+20080803+4585787-1'
Tag '2.3.1+git+20080803+4585787-1' created by Chris Lamb [EMAIL PROTECTED] at 2008-08-03 16:21 + Tagging drm-snapshot 2.3.1+git+20080803+4585787-1 Changes since drm-snapshot-2.3.1+git+20080706+401f77a-1: Chris Lamb (1): New upstream snapshot. --- debian/changelog | 56 +++ 1 file changed, 56 insertions(+) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
src/Makefile.am |7
src/drmmode_display.c | 183
src/nouveau_bo.c |2
src/nouveau_bo.h |1
src/nouveau_class.h | 465 +++---
src/nouveau_local.h | 92 +++---
src/nouveau_output.h |1
src/nouveau_xv.c | 221 +++---
src/nv04_xv_blit.c| 69 ++--
src/nv10_exa.c| 541 ++-
src/nv30_exa.c| 452 +++---
src/nv30_shaders.c| 64 ++--
src/nv30_xv_tex.c | 153 +-
src/nv40_exa.c| 423 ++--
src/nv40_xv_tex.c | 157 +-
src/nv50_accel.c | 342 ++
src/nv50_accel.h | 52 +++
src/nv50_dac.c|1
src/nv50_exa.c| 752 --
src/nv50_output.c |2
src/nv50_randr.c | 36 --
src/nv50_sor.c| 10
src/nv50_texture.h| 124
src/nv50_xv.c | 262 +
src/nv_accel_common.c | 301 ++--
src/nv_bios.c | 37 ++
src/nv_dma.c | 25 -
src/nv_dri.c |2
src/nv_driver.c |2
src/nv_exa.c | 437 +
src/nv_output.c |8
src/nv_proto.h| 14
src/nv_type.h |2
src/vl_hwmc.c | 148 +
src/vl_hwmc.h | 11
35 files changed, 3714 insertions(+), 1685 deletions(-)
New commits:
commit 89d786435267af58bcecaff206a09b035e666df5
Author: Ben Skeggs [EMAIL PROTECTED]
Date: Tue Jul 29 23:38:45 2008 +1000
nv50: fix mystery typo
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index 9b0a2ab..4e82c4e 100644
--- a/src/nv_accel_common.c
+++ b/src/nv_accel_common.c
@@ -466,7 +466,7 @@ NVAccelInit2D_NV50(ScrnInfoPtr pScrn)
if (nouveau_grobj_alloc(chan, Nv2D, 0x502d, pNv-Nv2D))
return FALSE;
}
- eng2d = pNv-Nv3D;
+ eng2d = pNv-Nv2D;
BEGIN_RING(chan, eng2d, 0x180, 3);
OUT_RING (chan, pNv-notify0-handle);
commit c0b67f3f3490e826c86eedb32bbcf327592aaaf5
Author: Ben Skeggs [EMAIL PROTECTED]
Date: Tue Jul 29 01:26:20 2008 +1000
remove use of implicit variables from pushbuf macros
This matches the gallium winsys now. At some point the ddx will get updates
so the common code is once again in sync to make it easier to do mm
changes to both the ddx and dri simultaneously.
But, I want to get this part out of the way first as the changes might take
a bit of work - and I don't want to have to deal with merge conflicts
everywhere if someone changes the accel code before I'm done :)
diff --git a/src/nouveau_local.h b/src/nouveau_local.h
index 76e0d30..54d62e5 100644
--- a/src/nouveau_local.h
+++ b/src/nouveau_local.h
@@ -64,95 +64,95 @@ struct nouveau_pixmap {
#define NOUVEAU_DMA_TIMEOUT 2000
/* Push buffer access macros */
-#define BEGIN_RING(obj,mthd,size) do {
\
- BEGIN_RING_CH(pNv-chan, pNv-obj, (mthd), (size));\
+#define BEGIN_RING(chan,obj,mthd,size) do {
\
+ BEGIN_RING_CH((chan), (obj), (mthd), (size)); \
} while(0)
-#define OUT_RING(data) do {
\
- OUT_RING_CH(pNv-chan, (data));\
+#define OUT_RING(chan,data) do {
\
+ OUT_RING_CH((chan), (data)); \
} while(0)
-#define OUT_RINGp(src,size) do {
\
- OUT_RINGp_CH(pNv-chan, (src), (size));\
+#define OUT_RINGp(chan,src,size) do {
\
+ OUT_RINGp_CH((chan), (src), (size)); \
} while(0)
-#define OUT_RINGf(data) do {
\
+#define OUT_RINGf(chan,data) do {
\
union { float v; uint32_t u; } c; \
c.v = (data); \
- OUT_RING(c.u); \
+ OUT_RING((chan), c.u); \
} while(0)
-#define WAIT_RING(size) do {
\
- WAIT_RING_CH(pNv-chan, (size)); \
+#define WAIT_RING(chan,size) do {
\
+ WAIT_RING_CH((chan), (size)); \
} while(0)
-#define FIRE_RING() do {
\
- FIRE_RING_CH(pNv-chan);
xserver-xorg-video-nouveau: Changes to 'debian-experimental'
debian/changelog | 47 +++
debian/control|2
src/Makefile.am |7
src/drmmode_display.c | 183
src/nouveau_bo.c |2
src/nouveau_bo.h |1
src/nouveau_class.h | 465 +++---
src/nouveau_local.h | 92 +++---
src/nouveau_output.h |1
src/nouveau_xv.c | 221 +++---
src/nv04_xv_blit.c| 69 ++--
src/nv10_exa.c| 541 ++-
src/nv30_exa.c| 452 +++---
src/nv30_shaders.c| 64 ++--
src/nv30_xv_tex.c | 153 +-
src/nv40_exa.c| 423 ++--
src/nv40_xv_tex.c | 157 +-
src/nv50_accel.c | 342 ++
src/nv50_accel.h | 52 +++
src/nv50_dac.c|1
src/nv50_exa.c| 752 --
src/nv50_output.c |2
src/nv50_randr.c | 36 --
src/nv50_sor.c| 10
src/nv50_texture.h| 124
src/nv50_xv.c | 262 +
src/nv_accel_common.c | 301 ++--
src/nv_bios.c | 37 ++
src/nv_dma.c | 25 -
src/nv_dri.c |2
src/nv_driver.c |2
src/nv_exa.c | 437 +
src/nv_output.c |8
src/nv_proto.h| 14
src/nv_type.h |2
src/vl_hwmc.c | 148 +
src/vl_hwmc.h | 11
37 files changed, 3762 insertions(+), 1686 deletions(-)
New commits:
commit 1d2329e553dd8322b4a32e4af6590aa9afc50874
Author: Chris Lamb [EMAIL PROTECTED]
Date: Sun Aug 3 17:39:38 2008 +0100
Update dependency on libdrm-dev. Move to = relation.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index a950405..2e1413d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080803+30f54f2-1)
experimental; urgen
- ad56c5e... nv50: exa composite
- 33fad27... nv50: tile offscreen pixmaps
- 5c1deac... exa: pass window coords to m2mf-based UTS/DFS
+ * Update dependency on libdrm-dev. Move to = relation to make package
+binNMU safe.
-- Chris Lamb [EMAIL PROTECTED] Sun, 03 Aug 2008 17:34:24 +0100
diff --git a/debian/control b/debian/control
index bc30c41..454dfe3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: Chris Lamb [EMAIL PROTECTED], Matthew Johnson [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), 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.3.1+git+20080706+401f77a-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
+Build-Depends: debhelper (= 5), 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.3.1+git+20080803+4585787), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.8.0
Homepage: http://nouveau.freedesktop.org/wiki/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
commit 28443fad95ce9cbd6ed28639020c6810b950a026
Author: Chris Lamb [EMAIL PROTECTED]
Date: Sun Aug 3 17:36:06 2008 +0100
New upstream snapshot.
Signed-off-by: Chris Lamb [EMAIL PROTECTED]
diff --git a/debian/changelog b/debian/changelog
index 0de6cd2..a950405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,48 @@
+xserver-xorg-video-nouveau (1:0.0.10~git+20080803+30f54f2-1) experimental;
urgency=low
+
+ * New upstream snapshot:
+- 89d7864... nv50: fix mystery typo
+- c0b67f3... remove use of implicit variables from pushbuf macros
+- 80278c9... g3dvl: Basic XvMC initialization.
+- 1f8e27f... NV50: I was proven wrong quicker than i thought, reinstate a
+ slightly prettier hack.
+- 41d46f5... NV50: forgot something
+- 1b90524... NV50: my best guess at the lvds bios table, time will tell
+ if it's correct for more than a few cases
+- f3ec6e0... nouveau: fix macro as pointed out my moondrake on irc
+- 6652e9c... nv50: support YUY2 in textured video adaptor
+- 3534f40... nv50: remove 32bpp solid fill fallback
+- 87f7d1f... Revert NV50EXA: read the notes + cleanup + enabled 32bpp
+ solid fill
+- ba7c239... NV50EXA: serious brain fart of my part, sorry
+- 0b6249f... NV50EXA: read the notes + cleanup + enabled 32bpp solid fill
+- edbfbd0... EXA: put NOUVEAU_FALLBACK in a do { } while (0), fixed opera
+ corruption for me.
+- 36d1308
xserver-xorg-video-nouveau: Changes to 'refs/tags/xserver-xorg-video-nouveau-0.0.10-git+20080803+30f54f2-1'
Tag 'xserver-xorg-video-nouveau-0.0.10-git+20080803+30f54f2-1' created by Chris
Lamb [EMAIL PROTECTED] at 2008-08-03 16:43 +
Tagging 1:0.0.10~git+20080803+30f54f2-1
Changes since xserver-xorg-video-nouveau-0.0.10-git+20080706+b1f3169-1:
Ben Skeggs (20):
exa: pass window coords to m2mf-based UTS/DFS
nv50: tile offscreen pixmaps
nv50: exa composite
nv50: de-magic things before someone accuses me of being an NVIDIA
employee
nv50: Xv support
nv50: exa/xv share some stuff, punt it out to nv50_accel.[ch]
nv30: un-change something that somehow changed in an earlier commit. oops!
nv30: more bustage from header update
nv30: more header name changes...
exa: rename m2mf locals to prevent some confusion
nv50: remove acquire/release surface stuff
exa: missed a reloc delta
nv50: punt vertex emission macro out to header
nv50: sync after composite for the moment
nv50: no more sync in composite() :)
Revert NV50EXA: read the notes + cleanup + enabled 32bpp solid fill
nv50: remove 32bpp solid fill fallback
nv50: support YUY2 in textured video adaptor
remove use of implicit variables from pushbuf macros
nv50: fix mystery typo
Chris Lamb (3):
New upstream snapshot.
Update dependency on libdrm-dev. Move to = relation.
Merge branch 'upstream-experimental' into debian-experimental
Danny (1):
randr12: fix dithering output property endian issue (#16624)
Dave Airlie (1):
nouveau: fix macro as pointed out my moondrake on irc
Maarten Maathuis (7):
NV50_KMS: some basic scaling and dithering output property support
EXA: put NOUVEAU_FALLBACK in a do { } while (0), fixed opera corruption
for me.
NV50EXA: read the notes + cleanup + enabled 32bpp solid fill
NV50EXA: serious brain fart of my part, sorry
NV50: my best guess at the lvds bios table, time will tell if it's
correct for more than a few cases
NV50: forgot something
NV50: I was proven wrong quicker than i thought, reinstate a slightly
prettier hack.
Pawel Worach (1):
Fix for #14858 - freebsd compile. Someone still needs to fix the kernel
part though.
Younes Manton (1):
g3dvl: Basic XvMC initialization.
---
debian/changelog | 47 +++
debian/control|2
src/Makefile.am |7
src/drmmode_display.c | 183
src/nouveau_bo.c |2
src/nouveau_bo.h |1
src/nouveau_class.h | 465 +++---
src/nouveau_local.h | 92 +++---
src/nouveau_output.h |1
src/nouveau_xv.c | 221 +++---
src/nv04_xv_blit.c| 69 ++--
src/nv10_exa.c| 541 ++-
src/nv30_exa.c| 452 +++---
src/nv30_shaders.c| 64 ++--
src/nv30_xv_tex.c | 153 +-
src/nv40_exa.c| 423 ++--
src/nv40_xv_tex.c | 157 +-
src/nv50_accel.c | 342 ++
src/nv50_accel.h | 52 +++
src/nv50_dac.c|1
src/nv50_exa.c| 752 --
src/nv50_output.c |2
src/nv50_randr.c | 36 --
src/nv50_sor.c| 10
src/nv50_texture.h| 124
src/nv50_xv.c | 262 +
src/nv_accel_common.c | 301 ++--
src/nv_bios.c | 37 ++
src/nv_dma.c | 25 -
src/nv_dri.c |2
src/nv_driver.c |2
src/nv_exa.c | 437 +
src/nv_output.c |8
src/nv_proto.h| 14
src/nv_type.h |2
src/vl_hwmc.c | 148 +
src/vl_hwmc.h | 11
37 files changed, 3762 insertions(+), 1686 deletions(-)
---
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-nouveau: Changes to 'debian-experimental'
debian/changelog | 25 debian/control |2 src/Makefile.am | 12 src/drmmode_display.c| 129 ++ src/drmmode_display.h|4 src/nouveau_xv.c | 2190 +++ src/nv04_video_blitter.c | 268 - src/nv04_video_overlay.c | 201 src/nv04_xv_blit.c | 241 + src/nv04_xv_ovl.c| 201 src/nv10_video_overlay.c | 302 -- src/nv10_xv_ovl.c| 301 ++ src/nv30_video_texture.c | 457 - src/nv30_xv_tex.c| 431 + src/nv40_video_texture.c | 441 - src/nv40_xv_tex.c| 415 src/nv50_randr.c | 95 +- src/nv50_randr.h |1 src/nv_driver.c | 63 + src/nv_exa.c | 28 src/nv_proto.h | 41 src/nv_type.h|3 src/nv_video.c | 2173 -- 23 files changed, 4128 insertions(+), 3896 deletions(-) New commits: commit 2d6f50b2420525223991b62a5ce2fd47c10fe119 Author: Chris Lamb [EMAIL PROTECTED] Date: Sun Jul 6 20:51:58 2008 +0100 Update dependency on libdrm-dev. Signed-off-by: Chris Lamb [EMAIL PROTECTED] diff --git a/debian/changelog b/debian/changelog index a2ddcea..0de6cd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080706+b1f3169-1) experimental; urgen - 3298249... xv: reformat source so mere mortals can understand it - a1e8ccd... xv: nv_video.c to nouveau_xv.c - 3e17781... NV50_KMS: autodetect kernel modesetting when active + * Update dependency on libdrm-dev. -- Chris Lamb [EMAIL PROTECTED] Sun, 06 Jul 2008 20:26:53 +0100 diff --git a/debian/control b/debian/control index fdc0167..bc30c41 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Chris Lamb [EMAIL PROTECTED], Matthew Johnson [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), 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.3.1~git+20080703+301d984-1), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev +Build-Depends: debhelper (= 5), 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.3.1+git+20080706+401f77a-1), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev Standards-Version: 3.8.0 Homepage: http://nouveau.freedesktop.org/wiki/ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau commit ef0c1f09a2c7e4ae483396f3222b85e256a1ba06 Author: Chris Lamb [EMAIL PROTECTED] Date: Sun Jul 6 20:29:07 2008 +0100 New upstream snapshot Signed-off-by: Chris Lamb [EMAIL PROTECTED] diff --git a/debian/changelog b/debian/changelog index c933d7c..a2ddcea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +xserver-xorg-video-nouveau (1:0.0.10~git+20080706+b1f3169-1) experimental; urgency=low + + * New upstream snapshot: +- b1f3169... xv: remove some disturbing abuses of buffer related things +- 0ce028b... EXA: add a pixmapIsOffscreen hook. +- 86c70df... NV50_KMS: support gamma changes +- 6de89c8... NV50: Unaccelerated rotation support. +- 788fefa... NV50_KMS: Unaccelerated rotation support. +- 2bc1cb8... Revert EXA: Add PixmapIsOffscreen hook for EXA versions + that allow it. +- 5a5aee1... EXA: Add PixmapIsOffscreen hook for EXA versions that allow + it. +- b9f2358... xv: remove some defines that are in a header now +- 9f53b2a... xv: remove drawable handling from hw-specific PutImage.. + it's common... +- a50bba6... xv: misc cleanups +- 08e9489... NV50_KMS: minor change +- ea7e85b... Fix some compile warnings. +- 3298249... xv: reformat source so mere mortals can understand it +- a1e8ccd... xv: nv_video.c to nouveau_xv.c +- 3e17781... NV50_KMS: autodetect kernel modesetting when active + + -- Chris Lamb [EMAIL PROTECTED] Sun, 06 Jul 2008 20:26:53 +0100 + xserver-xorg-video-nouveau (1:0.0.10~git+20080702+48c2116-1) experimental; urgency=low * Re-upload latest snapshot fixed copyright in various upstream files commit b1f316977e2c79fdf5c83092e953bdfc988299e1 Author: Ben Skeggs [EMAIL PROTECTED] Date: Mon Jul 7 01:03:02 2008 +1000 xv: remove some disturbing abuses of buffer related things Also brings to attention a point about the overlay when we use a real memory manager. We'll need to find a way for the overlay to signal it's finished with a buffer, or just
xserver-xorg-video-nouveau: Changes to 'upstream-experimental'
src/Makefile.am | 12
src/drmmode_display.c| 129 ++
src/drmmode_display.h|4
src/nouveau_xv.c | 2190 +++
src/nv04_video_blitter.c | 268 -
src/nv04_video_overlay.c | 201
src/nv04_xv_blit.c | 241 +
src/nv04_xv_ovl.c| 201
src/nv10_video_overlay.c | 302 --
src/nv10_xv_ovl.c| 301 ++
src/nv30_video_texture.c | 457 -
src/nv30_xv_tex.c| 431 +
src/nv40_video_texture.c | 441 -
src/nv40_xv_tex.c| 415
src/nv50_randr.c | 95 +-
src/nv50_randr.h |1
src/nv_driver.c | 63 +
src/nv_exa.c | 28
src/nv_proto.h | 41
src/nv_type.h|3
src/nv_video.c | 2173 --
21 files changed, 4102 insertions(+), 3895 deletions(-)
New commits:
commit b1f316977e2c79fdf5c83092e953bdfc988299e1
Author: Ben Skeggs [EMAIL PROTECTED]
Date: Mon Jul 7 01:03:02 2008 +1000
xv: remove some disturbing abuses of buffer related things
Also brings to attention a point about the overlay when we use a real
memory manager. We'll need to find a way for the overlay to signal it's
finished with a buffer, or just resort to pinning pPriv-video_mem..
diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
index 486da87..973cde2 100644
--- a/src/nouveau_xv.c
+++ b/src/nouveau_xv.c
@@ -1007,7 +1007,6 @@ NV_set_action_flags(ScrnInfoPtr pScrn, DrawablePtr pDraw,
NVPortPrivPtr pPriv,
* @param data pointer to port
* @param pDraw drawable pointer
*/
-/*FIXME: need to honor the Sync*/
static int
NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x,
short drw_y, short src_w, short src_h, short drw_w, short drw_h,
@@ -1079,9 +1078,9 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x,
pPriv-video_mem);
if (ret)
return BadAlloc;
- offset = pPriv-video_mem-offset;
/* The overlay supports hardware double buffering. We handle this here*/
+ offset = 0;
if (pPriv-doubleBuffer) {
int mask = 1 (pPriv-currentBuffer 2);
@@ -1231,9 +1230,10 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x,
BEGIN_RING(NvMemFormat,
NV04_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
- OUT_RING ((uint32_t)destination_buffer-offset +
-line_len * nlines);
- OUT_RING ((uint32_t)offset + dstPitch * nlines);
+ OUT_RELOCl(destination_buffer, line_len * nlines,
+ NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+ OUT_RELOCl(pPriv-video_mem, offset + dstPitch * nlines,
+ NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
OUT_RING (line_len);
OUT_RING (dstPitch);
OUT_RING (line_len);
@@ -1245,8 +1245,10 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x,
BEGIN_RING(NvMemFormat,
NV04_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
- OUT_RING ((uint32_t)destination_buffer-offset);
- OUT_RING ((uint32_t)offset);
+ OUT_RELOCl(destination_buffer, 0,
+ NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+ OUT_RELOCl(pPriv-video_mem, offset,
+ NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
OUT_RING (line_len);
OUT_RING (dstPitch);
OUT_RING (line_len);
@@ -1287,8 +1289,7 @@ NVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x,
} else {
CPU_copy:
- map = pPriv-video_mem-map +
- (offset - pPriv-video_mem-offset);
+ map = pPriv-video_mem-map + offset;
if (action_flags IS_YV12) {
if (action_flags CONVERT_TO_YUY2) {
@@ -1389,9 +1390,9 @@ CPU_copy:
if (action_flags USE_OVERLAY) {
if (pNv-Architecture == NV_ARCH_04) {
- NV04PutOverlayImage(pScrn, offset, id, dstPitch,
- dstBox, 0, 0, xb, yb,
- npixels, nlines,
+ NV04PutOverlayImage(pScrn, pPriv-video_mem, offset,
+ id, dstPitch, dstBox, 0, 0,
+ xb, yb, npixels, nlines,
src_w, src_h, drw_w, drw_h,
clipBoxes);
} else {
@@ -1400,8 +1401,9 @@ CPU_copy:
if (action_flags (IS_YUY2 | CONVERT_TO_YUY2))
