diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-07-04 13:19:37 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-07-14 13:52:33 -0400 |
| commit | 0624ed0a86c411ad7a2070f670b540b323e29f35 (patch) | |
| tree | 377b11ecdcf0ad36f0342fa0c673478b37f73ee1 | |
| parent | 4936b859d1f4374a581e5eb3256a1b951d5e6687 (diff) | |
add OutputClass conf
This enables the xserver to associate the drm driver name "msm" to the
xf86-video-freedreno driver.
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | conf/42-freedreno.conf | 5 | ||||
| -rw-r--r-- | conf/Makefile.am | 23 | ||||
| -rw-r--r-- | configure.ac | 18 |
4 files changed, 47 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7052905..cff4dc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,4 +19,4 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = src man +SUBDIRS = src man conf diff --git a/conf/42-freedreno.conf b/conf/42-freedreno.conf new file mode 100644 index 0000000..608873c --- /dev/null +++ b/conf/42-freedreno.conf @@ -0,0 +1,5 @@ +Section "OutputClass" + Identifier "Video driver for Qualcomm processors" + MatchDriver "msm" + Driver "freedreno" +EndSection diff --git a/conf/Makefile.am b/conf/Makefile.am new file mode 100644 index 0000000..6b87c43 --- /dev/null +++ b/conf/Makefile.am @@ -0,0 +1,23 @@ +# Copyright 2005 Adam Jackson. +# +# 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 +# on 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: +# +# 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 NON-INFRINGEMENT. IN NO EVENT SHALL +# 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. + +if HAS_XORG_CONF_DIR +dist_config_DATA = 42-freedreno.conf +endif diff --git a/configure.ac b/configure.ac index 02f9f42..c2e1cf7 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,23 @@ AM_CONDITIONAL(LIBUDEV, [ test "x$LIBUDEV" = "xyes" ] ) AC_SUBST([LIBUDEV_CFLAGS]) AC_SUBST([LIBUDEV_LIBS]) + +# Define a configure option for an alternate X Server configuration directory +sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` +AC_ARG_WITH(xorg-conf-dir, + AC_HELP_STRING([--with-xorg-conf-dir=DIR], + [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), + [configdir="$withval"], + [configdir="$sysconfigdir"]) +AC_SUBST(configdir) + +# Older xserver is unhappy to encounter the new OutputClass +# sections, so avoid installing them if built for older +# server: +PKG_CHECK_EXISTS([xorg-server >= 1.15.99.904], [], [sysconfigdir=""]) + +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) + # Checks for header files. AC_HEADER_STDC @@ -98,4 +115,5 @@ AC_OUTPUT([ Makefile src/Makefile man/Makefile + conf/Makefile ]) |