xf86-video-modesetting: 16 commits - .gitignore COPYING Makefile.am README configure.ac man/Makefile.am src/Makefile.am src/drmmode_display.c
Dave Airlie
airlied at kemper.freedesktop.org
Wed Feb 22 02:09:52 PST 2012
.gitignore | 4 ++--
COPYING | 48 ++++++++++++++++++++++++++++++++++++++++--------
Makefile.am | 13 +++++++++++--
README | 23 +++++++++++++++++++++++
configure.ac | 32 +++++++++++++-------------------
man/Makefile.am | 8 ++++----
src/Makefile.am | 5 +----
src/drmmode_display.c | 17 +----------------
8 files changed, 95 insertions(+), 55 deletions(-)
New commits:
commit 07162838c91fd731cba4314409a35be02d851fb6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 22 10:07:06 2012 +0000
xf86-video-modesetting 0.2.0
diff --git a/configure.ac b/configure.ac
index aecb916..35cad4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
- [0.1.0],
+ [0.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
commit 06af66f018764c0d811e41b8d2808f3a9e5a5ade
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 22 09:59:12 2012 +0000
modesetting: fix warnings, remove dead code.
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c004721..7fa933a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -466,12 +466,6 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
.destroy = NULL, /* XXX */
};
-int drmmode_get_crtc_id(xf86CrtcPtr crtc)
-{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- return drmmode_crtc->hw_id;
-}
-
static void
drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
{
@@ -877,7 +871,7 @@ out_free_encoders:
}
-uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
+static uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
{
drmmode_output_private_ptr drmmode_output = output->driver_private, clone_drmout;
int i;
@@ -1074,15 +1068,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
return TRUE;
}
-void drmmode_set_cursor(ScrnInfoPtr scrn, drmmode_ptr drmmode, int id, struct dumb_bo *bo)
-{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- xf86CrtcPtr crtc = xf86_config->crtc[id];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-
- drmmode_crtc->cursor_bo = bo;
-}
-
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y, int flags)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
commit eb8fd8fdb8ba730f4fc47f1293cb9c0bea3dfd4a
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 16:13:34 2012 -0500
config: layout and comment the top portion of configure.ac
Reorder statements to be consistent with other modules so things
are easier to find.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index 34f3e81..aecb916 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,31 +20,31 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
[0.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-modesetting])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
-
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before runnign autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-
AC_CONFIG_AUX_DIR(.)
-
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_SYS_LARGEFILE
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
commit ffefc3e37048c10470d17206af755953e2fa67f1
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:36:19 2012 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index 610c043..34f3e81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,12 +48,12 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
commit bf26bb974c1e47b8848ddab7dc2b2fe5d5f4fe72
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:36:17 2012 -0500
make: add all warnings according to the platform
The current code only adds -Wall and only for gcc.
Automake reserves the use of CPPFLAGS for the user to override
on the command line.
This also breaks the option --enable-strict-compilation
The variable CWARNFLAGS contains the complete set of warnings
and is platform sensitive.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index a2488f2..610c043 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,10 +45,6 @@ AM_MAINTAINER_MODE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-if test "x$GCC" = "xyes"; then
- CPPFLAGS="$CPPFLAGS -Wall"
-fi
-
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
diff --git a/src/Makefile.am b/src/Makefile.am
index 40ebf0a..68a63fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @UDEV_CFLAGS@
+AM_CFLAGS = $(XORG_CFLAGS) $(DRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS)
modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
modesetting_drv_la_LDFLAGS = -module -avoid-version
commit 7a2d46d0031b89cdf21717f0e64afca88ba116db
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:36:16 2012 -0500
make: remove empty variable assignment
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index efc4bc0..40ebf0a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# 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.
-SUBDIRS =
# this is obnoxious:
# -module lets us name the module exactly how we want
@@ -37,5 +36,3 @@ modesetting_drv_la_SOURCES = \
driver.h \
drmmode_display.c \
drmmode_display.h
-
-EXTRA_DIST =
commit 3fa7fe00f7b954236bf5262614a0ad1002f1a1d2
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:36:15 2012 -0500
Remove unneeded AM_PROG_CC_C_CO
There are no objects in subdirs or compiled multiple times
with different flags.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index c936683..a2488f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,6 @@ AM_MAINTAINER_MODE
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AM_PROG_CC_C_O
if test "x$GCC" = "xyes"; then
CPPFLAGS="$CPPFLAGS -Wall"
commit e312659c698f256eb90bca8b23407bafeb9a0be7
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:28 2012 -0500
Remove redundant AC_PROG_CC
Already covered by XORG_DEFAULT_OPTIONS
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index 01596b5..c936683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,6 @@ AM_MAINTAINER_MODE
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AM_PROG_CC_C_O
if test "x$GCC" = "xyes"; then
commit d6087ea8e87e30f9d831198d0102aeeeb7d67960
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:27 2012 -0500
Replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/configure.ac b/configure.ac
index fcfe330..01596b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-modesetting],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before runnign autoconf/autogen])])
commit d0d91eeab21f6b615905b71d07d62688502f1f9c
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:26 2012 -0500
Add missing targets for ChangeLog and INSTALL
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 052c611..8e4dfdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,3 +19,15 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
commit abf9b0263211296a34279094cb92d2465d83e05d
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:25 2012 -0500
Remove redundant EXTRA_DIST for the README file.
Autotools know about it, it is always distributed.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 9a525f0..052c611 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,5 +19,3 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
-
-EXTRA_DIST = README
commit 7ec1a88be3f40eb4b1189cdb9ee60d431231c3b4
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:24 2012 -0500
make: remove redundant AUTOMAKE_OPTIONS
Already covered by AM_INIT_AUTOMAKE([foreign dist-bzip2])
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 8cbe4a9..9a525f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# 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.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README
commit 81b63547599edaee7a2dc3ebb06e3e4e537d3f84
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:23 2012 -0500
Fix typo in .gitignore
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/.gitignore b/.gitignore
index 4cada5a..dc5a5cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,9 @@ core
*.tar.bz2
*.tar.gz
#
-# Add & Override patterns for xf86-video-intel
+# Add & Override patterns for xf86-video-modesetting
#
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
-#
+#
cscope*
commit 81e1cd9337fb7b2efacb35a6d0af9f7ab7ba74f0
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:22 2012 -0500
man: missing AM_V_GEN and hard-coded sed command name
Let's use the common xorg makefile for all drivers.
This ensures no new problems are introduced.
Improvements are welcome and to be applied to all drivers.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 936821c..5e96df5 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,16 +25,16 @@
#
drivermandir = $(DRIVER_MAN_DIR)
-driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
+driverman_PRE = @DRIVER_NAME at .man
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME at .man
CLEANFILES = $(driverman_DATA)
-SED = sed
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
-
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit 3189196ece713ca7a0058d2d76e0eaaf9757fc35
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:21 2012 -0500
Add contact information to the README file
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/README b/README
index 4578d7f..7ca3286 100644
--- a/README
+++ b/README
@@ -1,3 +1,26 @@
This is a generic modesetting driver.
The idea is to piggy-back the X driver on top of the DRM and Gallium3D
drivers (DRM for modesetting and Gallium3D for Exa acceleration)
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-modesetting
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-modesetting
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit a5edc0cfba9618e37f5c9eb3305e78f298f4f16b
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Feb 19 08:34:20 2012 -0500
Fill the COPYING file with license text
This reflects the copyright license text in the source code
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/COPYING b/COPYING
index 7f33cbf..9508e25 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,44 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 2011 Dave Airlie
+All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright © 2007 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER 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.
More information about the xorg-commit
mailing list