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

2013-12-03 Thread Maarten Lankhorst 
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5fa802edf768c9a5ca056c96ae0d01f44aa701df
Author: Maarten Lankhorst 
Date:   Tue Dec 3 12:58:17 2013 +0100

add missing entry

diff --git a/debian/changelog b/debian/changelog
index 98464ec..a09fbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-modesetting (0.8.0-0ubuntu1.1) saucy; urgency=low
+
+  * Rebuild for the new xorg video abi.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
14:39:15 +0200
+
 xserver-xorg-video-modesetting (0.8.0-0ubuntu1) saucy; urgency=low
 
   * Merge from unreleased debian git.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vnoss-00074f...@moszumanska.debian.org

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

2013-06-12 Thread Maarten Lankhorst 
 configure.ac|2 -
 debian/changelog|   21 +
 debian/patches/.gitignore   |1 
 debian/patches/series   |2 -
 debian/patches/support-32bpp-on-24bpp.patch |   13 
 src/driver.c|   43 +++-
 src/drmmode_display.c   |2 -
 src/drmmode_display.h   |2 -
 8 files changed, 42 insertions(+), 44 deletions(-)

New commits:
commit 4eea451d67ff7c6ac7685ef74a00f14afc22004f
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:37:22 2013 +0200

release to saucy

diff --git a/debian/changelog b/debian/changelog
index 1e11b40..98464ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-modesetting (0.8.0-0ubuntu1) saucy; urgency=low
+
+  * Merge from unreleased debian git.
+- Drop support-32bpp-on-24bpp.patch, upstreamed.
+
+ -- Maarten Lankhorst   Wed, 12 Jun 2013 
14:35:29 +0200
+
 xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
deleted file mode 100644
index 69f1bf4..000
--- a/debian/patches/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!*.patch
diff --git a/debian/patches/series b/debian/patches/series
index 58ae276..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-support-32bpp-on-24bpp.patch
+# placeholder
diff --git a/debian/patches/support-32bpp-on-24bpp.patch 
b/debian/patches/support-32bpp-on-24bpp.patch
deleted file mode 100644
index 4e9c5a8..000
--- a/debian/patches/support-32bpp-on-24bpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/driver.c b/src/driver.c
-index 06d6d53..742aadd 100644
 a/src/driver.c
-+++ b/src/driver.c
-@@ -650,7 +650,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
- if (defaultdepth == 24 && defaultbpp == 24)
--  bppflags = Support24bppFb;
-+  bppflags = SupportConvert32to24 | Support24bppFb;
- else
-   bppflags = PreferConvert24to32 | SupportConvert24to32 | 
Support32bppFb;
- 

commit 9949a0fdc3290717eed4f55a6cbee87ef74708b0
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:34:36 2013 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index ac74449..9a55573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require x-server 1.13rc1

commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:11:53 2013 +0200

bump to 0.8.0

Signed-off-by: Maarten Lankhorst 

diff --git a/configure.ac b/configure.ac
index f0c267f..6f7a7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.7.0],
+[0.8.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
Author: Maarten Lankhorst 
Date:   Wed Jun 12 14:05:19 2013 +0200

modesetting: probe only succeeds if connectors are detected

This will prevent modesetting being used for outputless intel or nvidia 
cards.

Signed-off-by: Maarten Lankhorst 

diff --git a/src/driver.c b/src/driver.c
index c3d78be..cc526f6 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -201,12 +201,25 @@ static int open_hw(char *dev)
 return fd;
 }
 
+static int check_outputs(int fd)
+{
+drmModeResPtr res = drmModeGetResources(fd);
+int ret;
+
+if (!res)
+return FALSE;
+ret = res->count_connectors > 0;
+drmModeFreeResources(res);
+return ret;
+}
+
 static Bool probe_hw(char *dev)
 {
 int fd = open_hw(dev);
 if (fd != -1) {
+int ret = check_outputs(fd);
 close(fd);
-return TRUE;
+return ret;
 }
 return FALSE;
 }
@@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
 
 static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
 {
-int fd = open_hw(dev);
+int ret = FALSE, fd = open_hw(dev);
 char *id, *devid;
 drmSetVersion sv;
 
@@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device 
*pdev)
 devid = ms_DRICreatePCIBusID(pdev);
 close(fd);
 
-if (!id || !devid)
-   return FALSE;
-
-if (!strcmp(id, devid))
-   return TRUE;
+if (id && devid && !strcmp(id, devid))
+ret = check_outputs(fd);
 
-return FALSE;
+free(id);
+free(devid);
+return ret;
 }
 static const OptionInfoRec *
 AvailableOptions(int chipid, int busid)

commit a62d5e60896166be88fcf3778921b8d1

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

2013-04-03 Thread Maarten Lankhorst 
 debian/changelog|7 +++
 debian/patches/.gitignore   |1 +
 debian/patches/series   |2 +-
 debian/patches/support-32bpp-on-24bpp.patch |   13 +
 4 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 6d056079e3b22f7a2a3432425408ac01ff6dd4f6
Author: Maarten Lankhorst 
Date:   Wed Apr 3 12:04:57 2013 +0200

Support 32-bpp pixmaps when 24 bpp is used. (LP: #1080674)

support-32bpp-on-24bpp.patch

diff --git a/debian/changelog b/debian/changelog
index 9459543..babef7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-modesetting (0.7.0-0ubuntu2) raring; urgency=low
+
+  * Support 32-bpp pixmaps when 24 bpp is used. (LP: #1080674)
+- support-32bpp-on-24bpp.patch
+
+ -- Maarten Lankhorst   Wed, 03 Apr 2013 
12:01:18 +0200
+
 xserver-xorg-video-modesetting (0.7.0-0ubuntu1) raring; urgency=low
 
   * Merge from unreleased debian git.
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..58ae276 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+support-32bpp-on-24bpp.patch
diff --git a/debian/patches/support-32bpp-on-24bpp.patch 
b/debian/patches/support-32bpp-on-24bpp.patch
new file mode 100644
index 000..4e9c5a8
--- /dev/null
+++ b/debian/patches/support-32bpp-on-24bpp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/driver.c b/src/driver.c
+index 06d6d53..742aadd 100644
+--- a/src/driver.c
 b/src/driver.c
+@@ -650,7 +650,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+ #endif
+ drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
+ if (defaultdepth == 24 && defaultbpp == 24)
+-  bppflags = Support24bppFb;
++  bppflags = SupportConvert32to24 | Support24bppFb;
+ else
+   bppflags = PreferConvert24to32 | SupportConvert24to32 | 
Support32bppFb;
+ 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1unkc0-00088i...@vasks.debian.org

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

2013-03-27 Thread Maarten Lankhorst 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 165e0f5a31028383fec17ff2ce05e2b6efc40112
Author: Maarten Lankhorst 
Date:   Wed Mar 27 13:45:27 2013 +0100

While arguably precise would benefit from a bump in xxv-nouveau, it will 
probably not pass sru review. Fix up distro to correct value.

diff --git a/debian/changelog b/debian/changelog
index 6a6c913..9459543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.7.0-0ubuntu1) precise; urgency=low
+xserver-xorg-video-modesetting (0.7.0-0ubuntu1) raring; urgency=low
 
   * Merge from unreleased debian git.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ukpnu-00085r...@vasks.debian.org

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

2013-03-27 Thread Maarten Lankhorst 
 autogen.sh|4 +-
 configure.ac  |2 -
 debian/changelog  |   12 --
 debian/patches/series |2 -
 src/driver.c  |   30 +++-
 src/drmmode_display.c |   91 +-
 6 files changed, 125 insertions(+), 16 deletions(-)

New commits:
commit f124f218a4fd0c36b6cc71e5a13305fd540b4679
Author: Maarten Lankhorst 
Date:   Wed Mar 27 13:35:00 2013 +0100

Merge from unreleased debian git.

diff --git a/debian/changelog b/debian/changelog
index 0ac3632..6a6c913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-modesetting (0.7.0-0ubuntu1) precise; urgency=low
+
+  * Merge from unreleased debian git.
+
+ -- Maarten Lankhorst   Wed, 27 Mar 2013 
13:34:24 +0100
+
 xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+# placeholder

commit ae209703ba6bdff292c00a4b93a5a1314324b9d3
Author: Maarten Lankhorst 
Date:   Wed Mar 27 13:32:03 2013 +0100

new upstream release

diff --git a/debian/changelog b/debian/changelog
index 086dcfb..ac74449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require x-server 1.13rc1

commit 332fbe8e13502c11bf32353123cba5e1e1bf3796
Author: Maarten Lankhorst 
Date:   Wed Mar 27 10:33:46 2013 +0100

bump version to 0.7.0

diff --git a/configure.ac b/configure.ac
index 562249e..f0c267f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.6.0],
+[0.7.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 3c631228a9f57e73ee693d5283894db1a460e0a4
Author: Maarten Lankhorst 
Date:   Tue Mar 26 15:19:52 2013 +0100

modesetting: return null for get_modes if output could not be retrieved

Signed-off-by: Maarten Lankhorst 

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8ebef1..2dc7576 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -709,6 +709,9 @@ drmmode_output_get_modes(xf86OutputPtr output)
drmModePropertyPtr props;
xf86MonPtr mon = NULL;
 
+   if (!koutput)
+   return NULL;
+
/* look for an EDID property */
for (i = 0; i < koutput->count_props; i++) {
props = drmModeGetProperty(drmmode->fd, koutput->props[i]);

commit e5b5297ac449fb4ac62cc6471f933ae2265778a2
Author: Maarten Lankhorst 
Date:   Tue Mar 26 15:19:33 2013 +0100

modesetting: clean up leaks

Signed-off-by: Maarten Lankhorst 

diff --git a/src/driver.c b/src/driver.c
index 87ba272..06d6d53 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -206,7 +206,7 @@ static Bool probe_hw(char *dev)
 int fd = open_hw(dev);
 if (fd != -1) {
 close(fd);
-   return TRUE;
+return TRUE;
 }
 return FALSE;
 }
@@ -530,15 +530,27 @@ static void msBlockHandler(BLOCKHANDLER_ARGS_DECL)
 static void
 FreeRec(ScrnInfoPtr pScrn)
 {
+modesettingPtr ms;
+
 if (!pScrn)
-   return;
+return;
 
-if (!pScrn->driverPrivate)
-   return;
+ms = modesettingPTR(pScrn);
+if (!ms)
+return;
+pScrn->driverPrivate = NULL;
 
-free(pScrn->driverPrivate);
+if (ms->fd > 0) {
+int ret;
+
+if (ms->pEnt->location.type == BUS_PCI)
+ret = drmClose(ms->fd);
+else
+ret = close(ms->fd);
+}
+free(ms->Options);
+free(ms);
 
-pScrn->driverPrivate = NULL;
 }
 
 static Bool
@@ -596,8 +608,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
 
 #if XSERVER_PLATFORM_BUS
 if (pEnt->location.type == BUS_PLATFORM) {
-char *path = 
xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH);
-ms->fd = open_hw(path);
+char *path = xf86_get_platform_device_attrib(pEnt->location.id.plat, 
ODEV_ATTRIB_PATH);
+ms->fd = open_hw(path);
 }
 else 
 #endif

commit 1e571934629280053caeb155e418acbdca609e36
Author: Aaron Plattner 
Date:   Wed Feb 20 17:27:16 2013 -0800

modesetting: match PCI class 3, any subclass

If a device is not primary, the PCI device match fails because the
xf86-video-modesetting driver looks specifically for a PCI class match of
0x3 with a mask of 0xff.  This fails to match, for example, a
non-primary Intel VGA device, because it is reported as having a class of
0x38000.

Fix that by ignoring the low 16 bits of the class in the pci_id_match table.

Signed-off-by: Aaron Plattner 
Rev

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

2013-01-23 Thread Timo Aaltonen 
 Makefile.am   |2 ++
 autogen.sh|1 +
 configure.ac  |3 ++-
 debian/changelog  |   16 +++-
 src/driver.c  |7 +--
 src/drmmode_display.c |   13 +++--
 src/drmmode_display.h |2 ++
 7 files changed, 34 insertions(+), 10 deletions(-)

New commits:
commit 8fe19053f4c56430c2db73af12d4913a2d438343
Author: Timo Aaltonen 
Date:   Wed Jan 23 11:06:07 2013 +0200

release to raring

diff --git a/debian/changelog b/debian/changelog
index b2a9943..d4f038d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-modesetting (0.6.0-0ubuntu1) raring; urgency=low
+
+  * Merge from unreleased debian git.
+
+ -- Timo Aaltonen   Wed, 23 Jan 2013 11:04:10 +0200
+
 xserver-xorg-video-modesetting (0.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit 0a1134ee81e7aea084390ad3b28c103c6c1c6b52
Author: Timo Aaltonen 
Date:   Wed Jan 23 10:52:20 2013 +0200

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 01008ae..086dcfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.5.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Require x-server 1.13rc1

commit 404b5e2b53578d8b78471da5a80a85c6acc4
Author: Dave Airlie 
Date:   Wed Jan 9 13:04:00 2013 +1000

modesetting: bump to 0.6.0

diff --git a/configure.ac b/configure.ac
index 58b1666..562249e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.5.0],
+[0.6.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 282e6876fc32d41648684b858e13130c97a58b8e
Author: Dave Airlie 
Date:   Wed Jan 9 12:48:30 2013 +1000

modesetting: fix crashes caused by udev race conditions

So the kernel removes the device, and the driver processes the first
udev event, and gets no output back from the kernel, so it check
and don't fall over.

This fixes a couple of crashes seen when hotplugging USB devices.

Signed-off-by: Dave Airlie 

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 8d760c2..42cd5ac 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -589,6 +589,8 @@ drmmode_output_detect(xf86OutputPtr output)
drmModeFreeConnector(drmmode_output->mode_output);
 
drmmode_output->mode_output = drmModeGetConnector(drmmode->fd, 
drmmode_output->output_id);
+   if (!drmmode_output->mode_output)
+   return XF86OutputStatusDisconnected;
 
switch (drmmode_output->mode_output->connection) {
case DRM_MODE_CONNECTED:
@@ -683,6 +685,9 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
drmModeConnectorPtr koutput = drmmode_output->mode_output;
drmmode_ptr drmmode = drmmode_output->drmmode;
 
+   if (!koutput)
+   return;
+
drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
drmmode_output->dpms_enum_id, mode);
return;

commit 0ad9fb5109a3cd3bded6455aa2fca0a1fe18e980
Author: Thierry Reding 
Date:   Thu Nov 8 14:28:10 2012 +0100

Remove call to miInitializeBackingStore()

Recent versions of the X server no longer provide this function, which
has been obsolete for over 2 years now.

Signed-off-by: Thierry Reding 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie 

diff --git a/src/driver.c b/src/driver.c
index 200a6d8..05b6176 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -901,7 +901,6 @@ ScreenInit(SCREEN_INIT_ARGS_DECL)
 
 xf86SetBlackWhitePixels(pScreen);
 
-miInitializeBackingStore(pScreen);
 xf86SetBackingStore(pScreen);
 xf86SetSilkenMouse(pScreen);
 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());

commit 5b3f6e347ae1763f066848a07554e8d33e17662e
Author: Thierry Reding 
Date:   Thu Nov 8 14:28:09 2012 +0100

build: Put m4 macros in m4 subdirectory

This silences a warning from libtoolize when running the autogen.sh
script.

Signed-off-by: Thierry Reding 
Signed-off-by: Dave Airlie 

diff --git a/Makefile.am b/Makefile.am
index 8e4dfdb..a7ab3e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src man
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
index 904cd67..f83ed27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
 cd $srcdir
+test -d m4 || mkdir m4
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
diff --git a/configur

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

2012-09-13 Thread Timo Aaltonen 
 configure.ac |   10 
 debian/changelog |   21 +-
 debian/patches/adding-platform-bus-support.patch |  141 -
 debian/patches/series|2 
 src/driver.c |  240 +++
 src/drmmode_display.c|  118 +++
 src/drmmode_display.h|   27 ++
 7 files changed, 368 insertions(+), 191 deletions(-)

New commits:
commit 1f031c695518db92ba457663a6d5ac7f387a9642
Author: Timo Aaltonen 
Date:   Thu Sep 13 10:24:48 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 3236b8a..b9a95d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-modesetting (0.5.0-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.5.0-0ubuntu1) quantal; urgency=low
 
   * Sync from unreleased debian git.
 - Removed adding-platform-bus-support.patch, included upstream.
 
- -- Timo Aaltonen   Thu, 13 Sep 2012 10:23:33 +0300
+ -- Timo Aaltonen   Thu, 13 Sep 2012 10:24:26 +0300
 
 xserver-xorg-video-modesetting (0.5.0-1) UNRELEASED; urgency=low
 

commit 89bb7812b0da8646bec2cfe4568a44aaefc0d013
Author: Timo Aaltonen 
Date:   Thu Sep 13 10:24:20 2012 +0300

remove the upstream patch

diff --git a/debian/changelog b/debian/changelog
index 34383dd..3236b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-modesetting (0.5.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * Sync from unreleased debian git.
+- Removed adding-platform-bus-support.patch, included upstream.
+
+ -- Timo Aaltonen   Thu, 13 Sep 2012 10:23:33 +0300
+
 xserver-xorg-video-modesetting (0.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/adding-platform-bus-support.patch 
b/debian/patches/adding-platform-bus-support.patch
deleted file mode 100644
index 72b4019..000
--- a/debian/patches/adding-platform-bus-support.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From: Dave Airlie 
-Subject: modesetting: add platform bus support
-Origin: upstream, 
http://cgit.freedesktop.org/xorg/driver/xf86-video-modesetting/commit/?id=65054df
-Bug-Ubuntu: http://bugs.launchpad.net/bugs/1041727
-
-diff --git a/src/driver.c b/src/driver.c
-index 8c3f4a4..86be277 100644
 a/src/driver.c
-+++ b/src/driver.c
-@@ -52,6 +52,9 @@
- #include "xf86xv.h"
- #include 
- #include 
-+#ifdef XSERVER_PLATFORM_BUS
-+#include "xf86platformBus.h"
-+#endif
- #if XSERVER_LIBPCIACCESS
- #include 
- #endif
-@@ -88,6 +91,12 @@ static const struct pci_id_match ms_device_match[] = {
- };
- #endif
- 
-+#ifdef XSERVER_PLATFORM_BUS
-+static Bool ms_platform_probe(DriverPtr driver,
-+  int entity_num, int flags, struct 
xf86_platform_device *device,
-+intptr_t match_data);
-+#endif
-+
- _X_EXPORT DriverRec modesetting = {
- 1,
- "modesetting",
-@@ -99,6 +108,9 @@ _X_EXPORT DriverRec modesetting = {
- NULL,
- ms_device_match,
- ms_pci_probe,
-+#ifdef XSERVER_PLATFORM_BUS
-+ms_platform_probe,
-+#endif
- };
- 
- static SymTabRec Chipsets[] = {
-@@ -288,6 +300,40 @@ ms_pci_probe(DriverPtr driver,
- }
- #endif
- 
-+#ifdef XSERVER_PLATFORM_BUS
-+static Bool
-+ms_platform_probe(DriverPtr driver,
-+  int entity_num, int flags, struct xf86_platform_device *dev, 
intptr_t match_data)
-+{
-+ScrnInfoPtr scrn = NULL;
-+char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
-+int scr_flags = 0;
-+
-+if (flags & PLATFORM_PROBE_GPU_SCREEN)
-+scr_flags = XF86_ALLOCATE_GPU_SCREEN;
-+
-+if (probe_hw(path)) {
-+scrn = xf86AllocateScreen(driver, scr_flags);
-+xf86AddEntityToScreen(scrn, entity_num);
-+
-+scrn->driverName = "modesetting";
-+scrn->name = "modesetting";
-+scrn->PreInit = PreInit;
-+scrn->ScreenInit = ScreenInit;
-+scrn->SwitchMode = SwitchMode;
-+scrn->AdjustFrame = AdjustFrame;
-+scrn->EnterVT = EnterVT;
-+scrn->LeaveVT = LeaveVT;
-+scrn->FreeScreen = FreeScreen;
-+scrn->ValidMode = ValidMode;
-+xf86DrvMsg(scrn->scrnIndex, X_INFO,
-+   "using drv %s\n", path ? path : "default device");
-+}
-+
-+return scrn != NULL;
-+}
-+#endif
-+
- static Bool
- Probe(DriverPtr drv, int flags)
- {
-@@ -431,7 +477,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
- rgb defaultWeight = { 0, 0, 0 };
- EntityInfoPtr pEnt;
- EntPtr msEnt = NULL;
--char *BusID, *devicename;
-+char *BusID = NULL, *devicename;
- Bool prefer_shadow = TRUE;
- uint64_t value = 0;
- int ret;
-@@ -477,24 +523,32 @@ PreInit(ScrnInfoPtr pScrn, int flags)
- pScrn->progClock = TRUE;
- pScrn->rgbBits = 8;
- 
--ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
--if (ms->PciInfo) {
--   BusID = malloc(

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

2012-08-26 Thread Timo Aaltonen 
 debian/changelog |8 +
 debian/patches/adding-platform-bus-support.patch |  141 +++
 debian/patches/series|2 
 3 files changed, 150 insertions(+), 1 deletion(-)

New commits:
commit 1a543a01a1029f1c64e9c3d9fa5fa73b6e959cb6
Author: Timo Aaltonen 
Date:   Sun Aug 26 18:38:20 2012 +0300

release to quantal

* debian/patches/adding-platform-bus-support.patch:
  - Adding platformBus support, to protect xorg on also loading the fbdev
driver when running on ARM (mostly platform devices) (LP: #1041727)

diff --git a/debian/changelog b/debian/changelog
index 6648608..6858738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-modesetting (0.4.0-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/adding-platform-bus-support.patch:
+- Adding platformBus support, to protect xorg on also loading the fbdev
+  driver when running on ARM (mostly platform devices) (LP: #1041727)
+
+ -- Ricardo Salveti de Araujo   Sun, 26 Aug 2012 
00:10:21 -0300
+
 xserver-xorg-video-modesetting (0.4.0-0ubuntu1) quantal-proposed; urgency=low
 
   * Sync from unreleased debian git.
diff --git a/debian/patches/adding-platform-bus-support.patch 
b/debian/patches/adding-platform-bus-support.patch
new file mode 100644
index 000..72b4019
--- /dev/null
+++ b/debian/patches/adding-platform-bus-support.patch
@@ -0,0 +1,141 @@
+From: Dave Airlie 
+Subject: modesetting: add platform bus support
+Origin: upstream, 
http://cgit.freedesktop.org/xorg/driver/xf86-video-modesetting/commit/?id=65054df
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/1041727
+
+diff --git a/src/driver.c b/src/driver.c
+index 8c3f4a4..86be277 100644
+--- a/src/driver.c
 b/src/driver.c
+@@ -52,6 +52,9 @@
+ #include "xf86xv.h"
+ #include 
+ #include 
++#ifdef XSERVER_PLATFORM_BUS
++#include "xf86platformBus.h"
++#endif
+ #if XSERVER_LIBPCIACCESS
+ #include 
+ #endif
+@@ -88,6 +91,12 @@ static const struct pci_id_match ms_device_match[] = {
+ };
+ #endif
+ 
++#ifdef XSERVER_PLATFORM_BUS
++static Bool ms_platform_probe(DriverPtr driver,
++  int entity_num, int flags, struct 
xf86_platform_device *device,
++intptr_t match_data);
++#endif
++
+ _X_EXPORT DriverRec modesetting = {
+ 1,
+ "modesetting",
+@@ -99,6 +108,9 @@ _X_EXPORT DriverRec modesetting = {
+ NULL,
+ ms_device_match,
+ ms_pci_probe,
++#ifdef XSERVER_PLATFORM_BUS
++ms_platform_probe,
++#endif
+ };
+ 
+ static SymTabRec Chipsets[] = {
+@@ -288,6 +300,40 @@ ms_pci_probe(DriverPtr driver,
+ }
+ #endif
+ 
++#ifdef XSERVER_PLATFORM_BUS
++static Bool
++ms_platform_probe(DriverPtr driver,
++  int entity_num, int flags, struct xf86_platform_device *dev, 
intptr_t match_data)
++{
++ScrnInfoPtr scrn = NULL;
++char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
++int scr_flags = 0;
++
++if (flags & PLATFORM_PROBE_GPU_SCREEN)
++scr_flags = XF86_ALLOCATE_GPU_SCREEN;
++
++if (probe_hw(path)) {
++scrn = xf86AllocateScreen(driver, scr_flags);
++xf86AddEntityToScreen(scrn, entity_num);
++
++scrn->driverName = "modesetting";
++scrn->name = "modesetting";
++scrn->PreInit = PreInit;
++scrn->ScreenInit = ScreenInit;
++scrn->SwitchMode = SwitchMode;
++scrn->AdjustFrame = AdjustFrame;
++scrn->EnterVT = EnterVT;
++scrn->LeaveVT = LeaveVT;
++scrn->FreeScreen = FreeScreen;
++scrn->ValidMode = ValidMode;
++xf86DrvMsg(scrn->scrnIndex, X_INFO,
++   "using drv %s\n", path ? path : "default device");
++}
++
++return scrn != NULL;
++}
++#endif
++
+ static Bool
+ Probe(DriverPtr drv, int flags)
+ {
+@@ -431,7 +477,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+ rgb defaultWeight = { 0, 0, 0 };
+ EntityInfoPtr pEnt;
+ EntPtr msEnt = NULL;
+-char *BusID, *devicename;
++char *BusID = NULL, *devicename;
+ Bool prefer_shadow = TRUE;
+ uint64_t value = 0;
+ int ret;
+@@ -477,24 +523,32 @@ PreInit(ScrnInfoPtr pScrn, int flags)
+ pScrn->progClock = TRUE;
+ pScrn->rgbBits = 8;
+ 
+-ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
+-if (ms->PciInfo) {
+-   BusID = malloc(64);
+-   sprintf(BusID, "PCI:%d:%d:%d",
++#if XSERVER_PLATFORM_BUS
++if (pEnt->location.type == BUS_PLATFORM) {
++char *path = 
xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH);
++ms->fd = open_hw(path);
++}
++else 
++#endif
++if (pEnt->location.type == BUS_PCI) {
++ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
++if (ms->PciInfo) {
++BusID = malloc(64);
++sprintf(BusID, "PCI:%d:%d:%d",
+ #if XSERVER_LIBPCIACCESS
+-  ((ms->PciInfo->domain << 8) | ms->PciInfo->bus),
+-  ms->PciInfo->d

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

2012-08-26 Thread Timo Aaltonen 
New branch 'ubuntu' available with the following commits:
commit e463cf94fede2c473a96f40c70473fe10ef3c850
Author: Timo Aaltonen 
Date:   Sun Aug 26 18:34:40 2012 +0300

release to quantal


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t5ert-0001mm...@vasks.debian.org