mirror of
https://github.com/X11Libre/xf86-video-ati.git
synced 2026-03-24 01:24:43 +00:00
Add 10-radeon.conf xorg.conf.d snippet
This instructs Xorg >= 1.16 to try loading the radeon driver for devices managed by the radeon kernel driver, even if the ati wrapper driver isn't available. Copied from the amdgpu driver. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Michel Dänzer
parent
8e6a4e96b7
commit
55a33205cb
@@ -18,7 +18,7 @@
|
|||||||
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
# 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.
|
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
SUBDIRS = src man
|
SUBDIRS = src man conf
|
||||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
|
|
||||||
.PHONY: ChangeLog INSTALL
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|||||||
5
conf/10-radeon.conf
Normal file
5
conf/10-radeon.conf
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
Section "OutputClass"
|
||||||
|
Identifier "Radeon"
|
||||||
|
MatchDriver "radeon"
|
||||||
|
Driver "radeon"
|
||||||
|
EndSection
|
||||||
24
conf/Makefile.am
Normal file
24
conf/Makefile.am
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Copyright 2017 Advanced Micro Devices, 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
|
||||||
|
# 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 = 10-radeon.conf
|
||||||
|
endif
|
||||||
16
configure.ac
16
configure.ac
@@ -79,6 +79,20 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
|||||||
HAVE_XEXTPROTO_71="no")
|
HAVE_XEXTPROTO_71="no")
|
||||||
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||||
|
|
||||||
|
# Section "OutputClass" is only supported as of xserver 1.16
|
||||||
|
PKG_CHECK_EXISTS([xorg-server >= 1.16],
|
||||||
|
[sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`],
|
||||||
|
[sysconfigdir=""])
|
||||||
|
AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
|
||||||
|
|
||||||
|
# Define a configure option for an alternate X Server configuration directory
|
||||||
|
AC_ARG_WITH(xorg-conf-dir,
|
||||||
|
AS_HELP_STRING([--with-xorg-conf-dir=DIR],
|
||||||
|
[Default xorg.conf.d directory [[default=${prefix}/share/X11/xorg.conf.d]]]),
|
||||||
|
[configdir="$withval"],
|
||||||
|
[configdir='${prefix}/share/X11/xorg.conf.d'])
|
||||||
|
AC_SUBST(configdir)
|
||||||
|
|
||||||
AC_ARG_ENABLE([udev],
|
AC_ARG_ENABLE([udev],
|
||||||
AS_HELP_STRING([--disable-udev], [Disable libudev support [default=auto]]),
|
AS_HELP_STRING([--disable-udev], [Disable libudev support [default=auto]]),
|
||||||
[enable_udev="$enableval"],
|
[enable_udev="$enableval"],
|
||||||
@@ -265,6 +279,7 @@ AC_CONFIG_FILES([
|
|||||||
Makefile
|
Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
man/Makefile
|
man/Makefile
|
||||||
|
conf/Makefile
|
||||||
])
|
])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
@@ -276,6 +291,7 @@ echo " prefix: $prefix"
|
|||||||
echo " exec_prefix: $exec_prefix"
|
echo " exec_prefix: $exec_prefix"
|
||||||
echo " libdir: $libdir"
|
echo " libdir: $libdir"
|
||||||
echo " includedir: $includedir"
|
echo " includedir: $includedir"
|
||||||
|
echo " configdir: $configdir"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " CFLAGS: $CFLAGS"
|
echo " CFLAGS: $CFLAGS"
|
||||||
|
|||||||
Reference in New Issue
Block a user