Hello community,
here is the log from the commit of package xf86-video-modesetting for
openSUSE:Factory checked in at 2013-06-13 22:49:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-modesetting (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-modesetting.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-modesetting"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xf86-video-modesetting/xf86-video-modesetting.changes
2013-04-07 14:28:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-video-modesetting.new/xf86-video-modesetting.changes
2013-06-13 22:49:55.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Jun 12 13:53:10 UTC 2013 - [email protected]
+
+- Update to version 0.8.0:
+ + modesetting: fix adjust frame crash
+ + support 32 bpp pixmaps when 24 bpp fb is used.
+ + modesetting: probe only succeeds if connectors are detected
+
+-------------------------------------------------------------------
Old:
----
xf86-video-modesetting-0.7.0.tar.bz2
New:
----
xf86-video-modesetting-0.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-modesetting.spec ++++++
--- /var/tmp/diff_new_pack.NR82OT/_old 2013-06-13 22:49:55.000000000 +0200
+++ /var/tmp/diff_new_pack.NR82OT/_new 2013-06-13 22:49:55.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-video-modesetting
-Version: 0.7.0
+Version: 0.8.0
Release: 0
Summary: Generic modesetting driver
License: MIT
++++++ xf86-video-modesetting-0.7.0.tar.bz2 ->
xf86-video-modesetting-0.8.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/ChangeLog
new/xf86-video-modesetting-0.8.0/ChangeLog
--- old/xf86-video-modesetting-0.7.0/ChangeLog 2013-03-27 10:35:56.000000000
+0100
+++ new/xf86-video-modesetting-0.8.0/ChangeLog 2013-06-12 14:13:08.000000000
+0200
@@ -1,3 +1,46 @@
+commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
+Author: Maarten Lankhorst <[email protected]>
+Date: Wed Jun 12 14:11:53 2013 +0200
+
+ bump to 0.8.0
+
+ Signed-off-by: Maarten Lankhorst <[email protected]>
+
+commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
+Author: Maarten Lankhorst <[email protected]>
+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 <[email protected]>
+
+commit a62d5e60896166be88fcf3778921b8d10baec2c1
+Author: Dave Airlie <[email protected]>
+Date: Tue Jun 11 10:29:25 2013 +1000
+
+ modesetting: fix adjust frame crash
+
+ When SDL called this it was totally broken, actually hook
+ up to the underlying drmmode function.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808
+
+ Thanks to Peter Wu <[email protected]> for harassing me.
+
+ Signed-off-by: Dave Airlie <[email protected]>
+
+commit cba29fd8c2f605ed66718aa3a6b5833deb5d4cf9
+Author: Maarten Lankhorst <[email protected]>
+Date: Wed Apr 3 12:08:44 2013 +0200
+
+ support 32 bpp pixmaps when 24 bpp fb is used.
+
+ Fixes background corruption in ubuntu.
+
+ Signed-off-by: Maarten Lankhorst <[email protected]>
+
commit 332fbe8e13502c11bf32353123cba5e1e1bf3796
Author: Maarten Lankhorst <[email protected]>
Date: Wed Mar 27 10:33:46 2013 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/configure
new/xf86-video-modesetting-0.8.0/configure
--- old/xf86-video-modesetting-0.7.0/configure 2013-03-27 10:34:21.000000000
+0100
+++ new/xf86-video-modesetting-0.8.0/configure 2013-06-12 14:11:01.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-modesetting 0.7.0.
+# Generated by GNU Autoconf 2.69 for xf86-video-modesetting 0.8.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-modesetting'
PACKAGE_TARNAME='xf86-video-modesetting'
-PACKAGE_VERSION='0.7.0'
-PACKAGE_STRING='xf86-video-modesetting 0.7.0'
+PACKAGE_VERSION='0.8.0'
+PACKAGE_STRING='xf86-video-modesetting 0.8.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1370,7 +1370,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-modesetting 0.7.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-modesetting 0.8.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1441,7 +1441,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-modesetting
0.7.0:";;
+ short | recursive ) echo "Configuration of xf86-video-modesetting
0.8.0:";;
esac
cat <<\_ACEOF
@@ -1573,7 +1573,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-modesetting configure 0.7.0
+xf86-video-modesetting configure 0.8.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1897,7 +1897,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-modesetting $as_me 0.7.0, which was
+It was created by xf86-video-modesetting $as_me 0.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3771,7 +3771,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-modesetting'
- VERSION='0.7.0'
+ VERSION='0.8.0'
cat >>confdefs.h <<_ACEOF
@@ -19071,7 +19071,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-modesetting $as_me 0.7.0, which was
+This file was extended by xf86-video-modesetting $as_me 0.8.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19137,7 +19137,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-video-modesetting config.status 0.7.0
+xf86-video-modesetting config.status 0.8.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/configure.ac
new/xf86-video-modesetting-0.8.0/configure.ac
--- old/xf86-video-modesetting-0.7.0/configure.ac 2013-03-27
10:33:42.000000000 +0100
+++ new/xf86-video-modesetting-0.8.0/configure.ac 2013-06-12
14:10:45.000000000 +0200
@@ -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])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/src/driver.c
new/xf86-video-modesetting-0.8.0/src/driver.c
--- old/xf86-video-modesetting-0.7.0/src/driver.c 2013-03-26
15:17:09.000000000 +0100
+++ new/xf86-video-modesetting-0.8.0/src/driver.c 2013-06-12
14:07:36.000000000 +0200
@@ -201,12 +201,25 @@
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 @@
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 @@
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)
@@ -650,7 +662,7 @@
#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;
@@ -956,16 +968,9 @@
AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
SCRN_INFO_PTR(arg);
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86OutputPtr output = config->output[config->compat_output];
- xf86CrtcPtr crtc = output->crtc;
-
- if (crtc && crtc->enabled) {
- crtc->funcs->mode_set(crtc, pScrn->currentMode, pScrn->currentMode, x,
- y);
- crtc->x = output->initial_x + x;
- crtc->y = output->initial_y + y;
- }
+ modesettingPtr ms = modesettingPTR(pScrn);
+
+ drmmode_adjust_frame(pScrn, &ms->drmmode, x, y);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/src/drmmode_display.c
new/xf86-video-modesetting-0.8.0/src/drmmode_display.c
--- old/xf86-video-modesetting-0.7.0/src/drmmode_display.c 2013-03-26
15:17:09.000000000 +0100
+++ new/xf86-video-modesetting-0.8.0/src/drmmode_display.c 2013-06-12
14:07:36.000000000 +0200
@@ -1267,7 +1267,7 @@
return TRUE;
}
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y, int flags)
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config->output[config->compat_output];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-video-modesetting-0.7.0/src/drmmode_display.h
new/xf86-video-modesetting-0.8.0/src/drmmode_display.h
--- old/xf86-video-modesetting-0.7.0/src/drmmode_display.h 2013-03-26
15:17:03.000000000 +0100
+++ new/xf86-video-modesetting-0.8.0/src/drmmode_display.h 2013-06-12
14:07:36.000000000 +0200
@@ -118,7 +118,7 @@
#endif
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y, int flags);
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y);
extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
