From f5ce1e08e4bf143400c6f3b6f5d983cd2d3c277c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 12:19:10 +0000
Subject: import xorg-x11-server-1.20.4-10.el7


---

diff --git a/SOURCES/0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch b/SOURCES/0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch
new file mode 100644
index 0000000..b2d36e7
--- /dev/null
+++ b/SOURCES/0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch
@@ -0,0 +1,55 @@
+From 2a9268e4a0ba7b062ded4d361be3119d887aac41 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 3 Sep 2019 11:20:58 -0400
+Subject: [PATCH xserver] dri2: Set fallback driver names for Intel and AMD
+ chips
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+i965 and radeonsi, respectively, are the drivers that have been
+receiving new hardware support. It's really silly to need to update the
+server side to know specific new devices IDs every time a new ASIC comes
+out.
+
+Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
+---
+ hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
+index da7ea1c1e..04f372279 100644
+--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
++++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
+@@ -45,12 +45,6 @@ static const int r600_chip_ids[] = {
+ #undef CHIPSET
+ };
+ 
+-static const int radeonsi_chip_ids[] = {
+-#define CHIPSET(chip, name, family) chip,
+-#include "pci_ids/radeonsi_pci_ids.h"
+-#undef CHIPSET
+-};
+-
+ static const int virtio_gpu_chip_ids[] = {
+ #define CHIPSET(chip, name, family) chip,
+ #include "pci_ids/virtio_gpu_pci_ids.h"
+@@ -71,13 +65,14 @@ static const struct {
+ } driver_map[] = {
+    { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
+    { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
++   { 0x8086, "i965", NULL, -1 },
+ #ifndef DRIVER_MAP_GALLIUM_ONLY
+    { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
+    { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
+ #endif
+    { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
+    { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
+-   { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
++   { 0x1002, "radeonsi", NULL, -1 },
+    { 0x10de, "nouveau", NULL, -1 },
+    { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
+    { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
+-- 
+2.23.0
+
diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec
index 3cd7d5a..3fd5065 100644
--- a/SPECS/xorg-x11-server.spec
+++ b/SPECS/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.4
-Release:   9%{?gitdate:.%{gitdate}}%{?dist}
+Release:   10%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -127,6 +127,9 @@ Patch9800: 0001-xf86-set-status-to-connected-for-monitors-enabled-in.patch
 # Bug 1680120 - upstream backport to fix user switching
 Patch9900: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch
 
+# Bug 1763001 - Xorg.#.log show "(EE) modeset(0): [DRI2] No driver mapping found..."
+Patch9910: 0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -608,6 +611,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Jan 08 2020 Adam Jackson <ajax@redhat.com> - 1.20.4-10
+- Set fallback DRI2 driver names for Intel and AMD
+
 * Tue Aug 13 2019 Adam Jackson <ajax@redhat.com> - 1.20.4-9
 - Fix a crash when destroying a redirected window with backing store