xserver-xorg-video-modesetting: Changes to 'ubuntu'
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 <tjaalton@ubuntu.com>
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 <tjaalton@ubuntu.com> 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 <tjaalton@ubuntu.com>
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 404b5e2b53578d8b78471da5aaaaa80a85c6acc4
Author: Dave Airlie <airlied@redhat.com>
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 <airlied@redhat.com>
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 <airlied@redhat.com>
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 <thierry.reding@avionic-design.de>
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 <thierry.reding@avionic-design.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 <thierry.reding@avionic-design.de>
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 <thierry.reding@avionic-design.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
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/configure.ac b/configure.ac
index b6815c4..58b1666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_INIT([xf86-video-modesetting],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(.)
AC_SYS_LARGEFILE
commit 07e4b5c5e766d06a91178a0ff7589c842ee509fb
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 17 11:48:14 2012 +1000
modesetting: remove alloca usage again
this slipped back in.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/driver.c b/src/driver.c
index 38a1c09..200a6d8 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -428,10 +428,13 @@ static int dispatch_dirty_region(ScrnInfoPtr scrn,
unsigned num_cliprects = REGION_NUM_RECTS(dirty);
if (num_cliprects) {
- drmModeClip *clip = alloca(num_cliprects * sizeof(drmModeClip));
+ drmModeClip *clip = malloc(num_cliprects * sizeof(drmModeClip));
BoxPtr rect = REGION_RECTS(dirty);
int i, ret;
+ if (!clip)
+ return -ENOMEM;
+
/* XXX no need for copy? */
for (i = 0; i < num_cliprects; i++, rect++) {
clip[i].x1 = rect->x1;
@@ -442,6 +445,7 @@ static int dispatch_dirty_region(ScrnInfoPtr scrn,
/* TODO query connector property to see if this is needed */
ret = drmModeDirtyFB(ms->fd, fb_id, clip, num_cliprects);
+ free(clip);
DamageEmpty(damage);
if (ret) {
if (ret == -EINVAL)
commit fcf9ddf3c6ddb531020b532123118ab0216e6e65
Author: Alon Levy <alevy@redhat.com>
Date: Tue Aug 28 11:46:47 2012 +1000
modesetting: add virtual connector support
[airlied: also make sure we don't crash in future.]
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5e38265..8d760c2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -882,7 +882,8 @@ const char *output_names[] = { "None",
"HDMI",
"HDMI",
"TV",
- "eDP"
+ "eDP",
+ "Virtual"
};
static void
@@ -913,7 +914,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv
}
/* need to do smart conversion here for compat with non-kms ATI driver */
- snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
+ if (koutput->connector_type >= MS_ARRAY_SIZE(output_names))
+ snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
+ else
+ snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);
if (!output) {
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 24f7960..1d5522b 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -139,5 +139,7 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth
#define DRM_CAP_DUMB_PREFER_SHADOW 4
#endif
+#define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
#endif
Reply to: