[PATCH] xfree86: Add modesetting to list of fallback drivers
To make X -configure work properly, the output of fixup_video_driver_list()
should be in order of preference. Otherwise, the config file may use
the incorrect driver for some devices.
In particular, the drivers that work for all (or many) devices need to be
last in the list. Since the modesetting driver works for many devices,
it needs to be considered a fallback driver.
Signed-off-by: Søren Sandmann s...@redhat.com
---
hw/xfree86/common/xf86Config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 2adef44..481674d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -519,7 +519,7 @@ xf86InputDriverlistFromConfig(void)
static void
fixup_video_driver_list(const char **drivers)
{
-static const char *fallback[4] = { fbdev, vesa, wsfb, NULL };
+static const char *fallback[5] = { modesetting, fbdev, vesa, wsfb,
NULL };
const char **end, **drv;
const char *x;
int i;
--
1.8.3.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xfree86: Add modesetting to list of fallback drivers
Daniel Stone dan...@fooishbar.org writes: To make X -configure work properly, the output of fixup_video_driver_list() should be in order of preference. Otherwise, the config file may use the incorrect driver for some devices. In particular, the drivers that work for all (or many) devices need to be last in the list. Since the modesetting driver works for many devices, it needs to be considered a fallback driver. Surely this should come before fbdev and vesa though? Seems like it'd basically never get used as-is ... Fine by me. Søren ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH util/modular] Add gpg signing to release.sh
On Sat, 31 May 2014 16:49:56 -0700, Alan Coopersmith
alan.coopersm...@oracle.com wrote:
On 05/20/14 01:49 PM, Stephen Kitt wrote:
Peter Hutterer suggested I send this here; it's a patch to add gpg
signing to release.sh, both for the git tag and the generated tarballs.
This version tries to use gpg unconditionnally, it might be more useful
with a parameter to switch the behaviour...
Thanks for doing this - we keep talking about it, but never got the changes
made.
You're welcome! I noticed the announcement emails were being properly
gpg-signed, but not the tarballs.
I'd modified my copy locally to add -m to the git tag flags a couple months
ago, and that seems to have worked fine for me for the few releases I've
done since then.
The only problem I see with this patch for me is that on the systems I use
(Solaris 12.0 11.x development branches) GnuPG 2.x is installed as gpg2,
not gpg, so would appreciate having some way to override the exact path.
So I dropped my patch, applied yours, and tweaked it to allow setting the
GPG path, and it seemed to work fine for the xcursorgen release I just
pushed, so there are now xcursorgen-1.0.6.tar.bz2.sig
xcursorgen-1.0.6.tar.gz.sig files the script uploaded alongside the
released tarballs.
Excellent!
The one issue I did see is that I made a mistake on the first run (forgot to
push the version changing commit first), so the script aborted and re-ran,
and after re-running make distcheck to create new tarballs, I was then
prompted:
File `xcursorgen-1.0.6.tar.gz.sig' exists. Overwrite? (y/N) y
File `xcursorgen-1.0.6.tar.bz2.sig' exists. Overwrite? (y/N) y
Should those files be automatically deleted after rebuilding the tarballs?
I think so, otherwise we risk uploading invalid signatures...
I've attached my modified form of your patch for further review/discussion.
And I'm attaching an updated version which includes your modifications and
deletes the signatures if any before re-generating them.
I don't know what the X.org release signing policy is, I haven't found
anything in the wiki; the patch as-is works fine if people just use their
default key for signing, but if role keys are planned then it might be worth
adding an option to specify the key id to use. Perhaps that can come later,
it seems to me that the benefit of getting signed releases (which can then be
automatically checked, as is done in Debian) outweighs the benefit of key id
selection.
Regards,
Stephen
From 7d967b5ec2122a3f85730587be6d8a424fac9cdc Mon Sep 17 00:00:00 2001
From: Stephen Kitt sk...@debian.org
Date: Sun, 1 Jun 2014 14:46:01 +0200
Subject: [PATCH util/modular] Add gpg signing to release.sh
gpg-sign the git tag and the generated tarballs, and upload the signatures
along with the tarballs. Any existing tarball signatures are removed
beforehand.
Signed-off-by: Stephen Kitt sk...@debian.org
Modified by Alan Coopersmith to handle gpg vs. gpg2 paths for Solaris.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
---
release.sh | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/release.sh b/release.sh
index a4a725d..a2879ad 100755
--- a/release.sh
+++ b/release.sh
@@ -299,6 +299,10 @@ process_module() {
return 1
fi
+[ -n $targz ] rm -f ${targz}.sig $GPG -b $targz siggz=${targz}.sig || true
+[ -n $tarbz2 ] rm -f ${tarbz2}.sig $GPG -b $tarbz2 sigbz2=${tarbz2}.sig || true
+[ -n $tarxz ] rm -f ${tarxz}.sig $GPG -b $tarxz sigxz=${tarxz}.sig || true
+
# Obtain the top commit SHA which should be the version bump
# It should not have been tagged yet (the script will do it later)
local_top_commit_sha=`git rev-list --max-count=1 HEAD`
@@ -354,7 +358,7 @@ process_module() {
else
# Tag the top commit with the tar name
if [ x$DRY_RUN = x ]; then
- git tag -m $tar_name $tar_name
+ git tag -s -m $tar_name $tar_name
if [ $? -ne 0 ]; then
echo Error: unable to tag module with \$tar_name\.
cd $top_src
@@ -501,7 +505,7 @@ process_module() {
# Upload to host using the 'scp' remote file copy program
if [ x$DRY_RUN = x ]; then
echo Info: uploading tarballs to web server:
- scp $targz $tarbz2 $tarxz $USER_NAME$hostname:$srv_path
+ scp $targz $tarbz2 $tarxz $siggz $sigbz2 $sigxz $USER_NAME$hostname:$srv_path
if [ $? -ne 0 ]; then
echo Error: the tarballs uploading failed.
cd $top_src
@@ -627,6 +631,14 @@ if [ x$GREP = x ] ; then
fi
fi
+# Find path for GnuPG v2
+if [ x$GPG = x ] ; then
+if [ -x /usr/bin/gpg2 ] ; then
+ GPG=/usr/bin/gpg2
+else
+ GPG=gpg
+fi
+fi
# Set the default make tarball creation command
MAKE_DIST_CMD=distcheck
--
2.0.0.rc2
signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] present: Query the right CRTC to use each time
As the CRTCs may be reconfigured between each invocation, we can not
assume that the previous CRTC we used last time will still be valid for
this call. Either we need a way to validate the CRTC or, more
conveniently, query the CRTC to use each time. Note, that this still
does not validate the CRTC is passed in by the user - and xshmfence does
not mix well with asynchronous errors from X (i.e. the client can
trivially deadlock waiting for a signal that will never come).
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
---
present/present.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/present/present.c b/present/present.c
index e35de94..d1bb9d4 100644
--- a/present/present.c
+++ b/present/present.c
@@ -673,15 +673,8 @@ present_pixmap(WindowPtr window,
if (!screen_priv || !screen_priv-info)
target_crtc = NULL;
-else if (!target_crtc) {
-/* Update the CRTC if we have a pixmap or we don't have a CRTC
- */
-if (!pixmap)
-target_crtc = window_priv-crtc;
-
-if (!target_crtc)
-target_crtc = present_get_crtc(window);
-}
+else if (!target_crtc)
+target_crtc = present_get_crtc(window);
present_get_ust_msc(window, target_crtc, ust, crtc_msc);
--
2.0.0.rc4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] xtensa: add support for xtensa architecture
Signed-off-by: Max Filippov jcmvb...@gmail.com --- hw/xfree86/common/compiler.h|5 - hw/xfree86/os-support/linux/lnx_video.c |3 ++- include/servermd.h | 14 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 0319de0..1bd8def 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1352,7 +1352,10 @@ stl_u(unsigned long val, unsigned int *p) #else /* ix86 */ #if !defined(__SUNPRO_C) -#if !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) !defined(__sh__) !defined(__hppa__) !defined(__s390__) !defined(__m32r__) !defined(__aarch64__) !defined(__arc__) +#if !defined(FAKEIT) !defined(__mc68000__) !defined(__arm__) \ +!defined(__sh__) !defined(__hppa__) !defined(__s390__) \ +!defined(__m32r__) !defined(__aarch64__) !defined(__arc__) \ +!defined(__xtensa__) #ifdef GCCUSESGAS /* diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 40765fc..652f963 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -60,7 +60,8 @@ static Bool ExtendedEnabled = FALSE; !defined(__nds32__) \ !defined(__arm__) \ !defined(__aarch64__) \ - !defined(__arc__) + !defined(__arc__) \ + !defined(__xtensa__) /* * Due to conflicts with compiler.h, don't rely on sys/io.h to declare diff --git a/include/servermd.h b/include/servermd.h index 2d1ccb1..081123b 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -313,6 +313,20 @@ SOFTWARE. #endif /* ARC */ +#ifdef __xtensa__ + +#ifdef __XTENSA_EL__ +#define IMAGE_BYTE_ORDERLSBFirst +#define BITMAP_BIT_ORDERLSBFirst +#endif +#ifdef __XTENSA_EB__ +#define IMAGE_BYTE_ORDERMSBFirst +#define BITMAP_BIT_ORDERMSBFirst +#endif +#define GLYPHPADBYTES 4 + +#endif /* __xtensa__ */ + /* size of buffer to use with GetImage, measured in bytes. There's obviously * a trade-off between the amount of heap used and the number of times the * ddx routine has to be called. -- 1.7.7.6 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xrandr] Remove duplicate printing of the axis
Even in verbose mode, why print the same information twice? Signed-off-by: Connor Behan connor.be...@gmail.com --- xrandr.c | 4 1 file changed, 4 deletions(-) diff --git a/xrandr.c b/xrandr.c index 7a5fa30..d284f78 100644 --- a/xrandr.c +++ b/xrandr.c @@ -3861,10 +3861,6 @@ main (int argc, char **argv) else printf (neither axis); printf (\n); - - if (reflection RR_Reflect_X) printf(Setting reflection on X axis\n); - - if (reflection RR_Reflect_Y) printf(Setting reflection on Y axis\n); } /* we should test configureNotify on the root window */ -- 1.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xrandr] Allow -x and -y switches to undo themselves
People who want to dick around might think it is safe to run xrandr -x
before they know any of the other syntax. When xrandr -x again does
not get back to a normal screen, they are stuck having to read a manpage
with reflected text.
Signed-off-by: Connor Behan connor.be...@gmail.com
---
xrandr.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/xrandr.c b/xrandr.c
index d284f78..c00a9cb 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -2571,6 +2571,8 @@ main (int argc, char **argv)
Boolprovsetoffsink = False;
intmajor, minor;
Bool current = False;
+Booltoggle_x = False;
+Booltoggle_y = False;
program_name = argv[0];
for (i = 1; i argc; i++) {
@@ -2639,13 +2641,13 @@ main (int argc, char **argv)
}
if (!strcmp (-x, argv[i])) {
- reflection |= RR_Reflect_X;
+ toggle_x = True;
setit = True;
action_requested = True;
continue;
}
if (!strcmp (-y, argv[i])) {
- reflection |= RR_Reflect_Y;
+ toggle_y = True;
setit = True;
action_requested = True;
continue;
@@ -3824,6 +3826,11 @@ main (int argc, char **argv)
{
Rotation rotations = XRRConfigRotations(sc, current_rotation);
+if (toggle_x || toggle_y) {
+if (!(current_rotation RR_Reflect_X)) reflection |= RR_Reflect_X;
+if (!(current_rotation RR_Reflect_Y)) reflection |= RR_Reflect_Y;
+}
+
if (query) {
printf(Current rotation - %s\n,
rotation_name (current_rotation));
--
1.9.3
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xrandr] Allow -x and -y switches to undo themselves
People who want to dick around might think it is safe to run xrandr -x
before they know any of the other syntax. When xrandr -x again does
not get back to a normal screen, they are stuck having to read a manpage
with reflected text.
Signed-off-by: Connor Behan connor.be...@gmail.com
---
xrandr.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/xrandr.c b/xrandr.c
index d284f78..b3b58b1 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -2571,6 +2571,8 @@ main (int argc, char **argv)
Boolprovsetoffsink = False;
intmajor, minor;
Bool current = False;
+Booltoggle_x = False;
+Booltoggle_y = False;
program_name = argv[0];
for (i = 1; i argc; i++) {
@@ -2639,13 +2641,13 @@ main (int argc, char **argv)
}
if (!strcmp (-x, argv[i])) {
- reflection |= RR_Reflect_X;
+ toggle_x = True;
setit = True;
action_requested = True;
continue;
}
if (!strcmp (-y, argv[i])) {
- reflection |= RR_Reflect_Y;
+ toggle_y = True;
setit = True;
action_requested = True;
continue;
@@ -3824,6 +3826,9 @@ main (int argc, char **argv)
{
Rotation rotations = XRRConfigRotations(sc, current_rotation);
+if (toggle_x !(current_rotation RR_Reflect_X)) reflection |=
RR_Reflect_X;
+if (toggle_y !(current_rotation RR_Reflect_Y)) reflection |=
RR_Reflect_Y;
+
if (query) {
printf(Current rotation - %s\n,
rotation_name (current_rotation));
--
1.9.3
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH 1.5/4 util-modular] release.sh: force /bin/bash
Trying to meet a hard-to-test standard of /bin/sh is unnecessary for a script that's only run by maintainers. For now, simply force bash but don't change any of the script, over time we can update this to support true bashism like [[ ]]. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index e5774c2..a8d3451 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Creates and upload a git module tarball # -- 1.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 1.5/4 util-modular] release.sh: force /bin/bash
On 06/ 1/14 08:18 PM, Peter Hutterer wrote: Trying to meet a hard-to-test standard of /bin/sh is unnecessary for a script that's only run by maintainers. For now, simply force bash but don't change any of the script, over time we can update this to support true bashism like [[ ]]. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index e5774c2..a8d3451 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Creates and upload a git module tarball # Fine by me for Solaris - every non-EOL version has bash available, just not installed as /bin/sh. I can't speak for the other platforms though. Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com (For the morbidly curious, Solaris 10 and older have a pre-historic, pre-POSIX version of the Bourne shell from SVR4.0 as /bin/sh - you can find a port to other platforms at heirloom.sf.net. Solaris 11 later have ksh93 as /bin/sh, though we're watching to see how it survives the loss of the ATT/Bell Labs support going forward.) -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
