diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb | 11 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch | 505 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb | 15 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch | 52 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 11 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | 2 |
10 files changed, 31 insertions, 593 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb deleted file mode 100644 index d02988caa4..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.30.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "Generic input driver for the X.Org server based on libinput" -LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" - -DEPENDS += "libinput" - -SRC_URI[md5sum] = "11dcfa2cc39f790731a9545fcdeea717" -SRC_URI[sha256sum] = "f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0" - -FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb new file mode 100644 index 0000000000..e1c47aa5e7 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb @@ -0,0 +1,12 @@ +require xorg-driver-input.inc + +SUMMARY = "Generic input driver for the X.Org server based on libinput" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309" + +DEPENDS += "libinput" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b" + +FILES:${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb index 92a1b25ebe..5e740037d9 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb @@ -9,13 +9,13 @@ standard 'mouse' driver if a VMware virtual machine is not detected." SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" -RDEPENDS_${PN} += "xf86-input-mouse" +RDEPENDS:${PN} += "xf86-input-mouse" LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -do_install_append () { +do_install:append () { # We don't care about hal rm -rf ${D}${datadir}/hal/ rm -rf ${D}${libdir}/hal/ @@ -23,4 +23,4 @@ do_install_append () { EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" -FILES_${PN} += "${datadir}/X11/xorg.conf.d" +FILES:${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch deleted file mode 100644 index ef3b1afb1f..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch +++ /dev/null @@ -1,505 +0,0 @@ -From 05909fea93f29b2b6e1d554dd64201551bd7a022 Mon Sep 17 00:00:00 2001 -From: Liwei Song <liwei.song@windriver.com> -Date: Fri, 17 Apr 2020 16:11:59 +0800 -Subject: [PATCH] Sync i915_pciids upto 8717c6b7414f - -Import the kernel's i915_pciids.h, up to: - -commit 8717c6b7414ffb890672276dccc284c23078ac0e -Author: Lee Shawn C <shawn.c.lee@intel.com> -Date: Tue Dec 10 23:04:15 2019 +0800 - - drm/i915/cml: Separate U series pci id from origianl list. - -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/11494645/] - -Signed-off-by: Liwei Song <liwei.song@windriver.com> ---- - src/i915_pciids.h | 265 ++++++++++++++++++++++++++++++++++----------- - src/intel_module.c | 2 +- - test/dri3-test.c | 2 +- - 3 files changed, 206 insertions(+), 63 deletions(-) - -diff --git a/src/i915_pciids.h b/src/i915_pciids.h -index fd965ffbb92e..1d2c12219f44 100644 ---- a/src/i915_pciids.h -+++ b/src/i915_pciids.h -@@ -108,8 +108,10 @@ - INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \ - INTEL_VGA_DEVICE(0x2e92, info) /* B43_G.1 */ - --#define INTEL_PINEVIEW_IDS(info) \ -- INTEL_VGA_DEVICE(0xa001, info), \ -+#define INTEL_PINEVIEW_G_IDS(info) \ -+ INTEL_VGA_DEVICE(0xa001, info) -+ -+#define INTEL_PINEVIEW_M_IDS(info) \ - INTEL_VGA_DEVICE(0xa011, info) - - #define INTEL_IRONLAKE_D_IDS(info) \ -@@ -166,7 +168,18 @@ - #define INTEL_IVB_Q_IDS(info) \ - INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */ - -+#define INTEL_HSW_ULT_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \ -+ INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \ -+ INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \ -+ INTEL_VGA_DEVICE(0x0A06, info) /* ULT GT1 mobile */ -+ -+#define INTEL_HSW_ULX_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */ -+ - #define INTEL_HSW_GT1_IDS(info) \ -+ INTEL_HSW_ULT_GT1_IDS(info), \ -+ INTEL_HSW_ULX_GT1_IDS(info), \ - INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \ - INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \ - INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \ -@@ -175,20 +188,26 @@ - INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \ - INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \ - INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \ -- INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \ -- INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \ -- INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \ - INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \ - INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \ - INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \ - INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \ - INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \ - INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \ -- INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \ -- INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \ - INTEL_VGA_DEVICE(0x0D06, info) /* CRW GT1 mobile */ - -+#define INTEL_HSW_ULT_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \ -+ INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \ -+ INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \ -+ INTEL_VGA_DEVICE(0x0A16, info) /* ULT GT2 mobile */ -+ -+#define INTEL_HSW_ULX_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \ -+ - #define INTEL_HSW_GT2_IDS(info) \ -+ INTEL_HSW_ULT_GT2_IDS(info), \ -+ INTEL_HSW_ULX_GT2_IDS(info), \ - INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \ - INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \ - INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \ -@@ -197,9 +216,6 @@ - INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \ - INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \ - INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \ -- INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \ -- INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \ -- INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \ - INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \ - INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \ - INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \ -@@ -207,11 +223,17 @@ - INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \ - INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \ - INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \ -- INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \ -- INTEL_VGA_DEVICE(0x0A1E, info), /* ULX GT2 mobile */ \ - INTEL_VGA_DEVICE(0x0D16, info) /* CRW GT2 mobile */ - -+#define INTEL_HSW_ULT_GT3_IDS(info) \ -+ INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \ -+ INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \ -+ INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \ -+ INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \ -+ INTEL_VGA_DEVICE(0x0A2E, info) /* ULT GT3 reserved */ -+ - #define INTEL_HSW_GT3_IDS(info) \ -+ INTEL_HSW_ULT_GT3_IDS(info), \ - INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \ - INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \ - INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \ -@@ -220,16 +242,11 @@ - INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \ - INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \ - INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \ -- INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \ -- INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \ -- INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \ - INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \ - INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \ - INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \ - INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \ - INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \ -- INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \ -- INTEL_VGA_DEVICE(0x0A2E, info), /* ULT GT3 reserved */ \ - INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */ - - #define INTEL_HSW_IDS(info) \ -@@ -245,35 +262,59 @@ - INTEL_VGA_DEVICE(0x0157, info), \ - INTEL_VGA_DEVICE(0x0155, info) - --#define INTEL_BDW_GT1_IDS(info) \ -- INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \ -+#define INTEL_BDW_ULT_GT1_IDS(info) \ - INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \ -- INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \ -- INTEL_VGA_DEVICE(0x160E, info), /* GT1 ULX */ \ -+ INTEL_VGA_DEVICE(0x160B, info) /* GT1 Iris */ -+ -+#define INTEL_BDW_ULX_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x160E, info) /* GT1 ULX */ -+ -+#define INTEL_BDW_GT1_IDS(info) \ -+ INTEL_BDW_ULT_GT1_IDS(info), \ -+ INTEL_BDW_ULX_GT1_IDS(info), \ -+ INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \ - INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \ - INTEL_VGA_DEVICE(0x160D, info) /* GT1 Workstation */ - --#define INTEL_BDW_GT2_IDS(info) \ -- INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \ -+#define INTEL_BDW_ULT_GT2_IDS(info) \ - INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \ -- INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \ -- INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \ -+ INTEL_VGA_DEVICE(0x161B, info) /* GT2 ULT */ -+ -+#define INTEL_BDW_ULX_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x161E, info) /* GT2 ULX */ -+ -+#define INTEL_BDW_GT2_IDS(info) \ -+ INTEL_BDW_ULT_GT2_IDS(info), \ -+ INTEL_BDW_ULX_GT2_IDS(info), \ -+ INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \ - INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \ - INTEL_VGA_DEVICE(0x161D, info) /* GT2 Workstation */ - -+#define INTEL_BDW_ULT_GT3_IDS(info) \ -+ INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \ -+ INTEL_VGA_DEVICE(0x162B, info) /* Iris */ \ -+ -+#define INTEL_BDW_ULX_GT3_IDS(info) \ -+ INTEL_VGA_DEVICE(0x162E, info) /* ULX */ -+ - #define INTEL_BDW_GT3_IDS(info) \ -+ INTEL_BDW_ULT_GT3_IDS(info), \ -+ INTEL_BDW_ULX_GT3_IDS(info), \ - INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \ -- INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \ -- INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \ -- INTEL_VGA_DEVICE(0x162E, info), /* ULX */\ - INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ - INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ - -+#define INTEL_BDW_ULT_RSVD_IDS(info) \ -+ INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ -+ INTEL_VGA_DEVICE(0x163B, info) /* Iris */ -+ -+#define INTEL_BDW_ULX_RSVD_IDS(info) \ -+ INTEL_VGA_DEVICE(0x163E, info) /* ULX */ -+ - #define INTEL_BDW_RSVD_IDS(info) \ -+ INTEL_BDW_ULT_RSVD_IDS(info), \ -+ INTEL_BDW_ULX_RSVD_IDS(info), \ - INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \ -- INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ -- INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \ -- INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \ - INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ - INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ - -@@ -289,25 +330,40 @@ - INTEL_VGA_DEVICE(0x22b2, info), \ - INTEL_VGA_DEVICE(0x22b3, info) - -+#define INTEL_SKL_ULT_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */ -+ -+#define INTEL_SKL_ULX_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */ -+ - #define INTEL_SKL_GT1_IDS(info) \ -- INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \ -- INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \ -+ INTEL_SKL_ULT_GT1_IDS(info), \ -+ INTEL_SKL_ULX_GT1_IDS(info), \ - INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \ - INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \ - INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */ - --#define INTEL_SKL_GT2_IDS(info) \ -+#define INTEL_SKL_ULT_GT2_IDS(info) \ - INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \ -- INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \ -- INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \ -+ INTEL_VGA_DEVICE(0x1921, info) /* ULT GT2F */ -+ -+#define INTEL_SKL_ULX_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x191E, info) /* ULX GT2 */ -+ -+#define INTEL_SKL_GT2_IDS(info) \ -+ INTEL_SKL_ULT_GT2_IDS(info), \ -+ INTEL_SKL_ULX_GT2_IDS(info), \ - INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \ - INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \ - INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */ - -+#define INTEL_SKL_ULT_GT3_IDS(info) \ -+ INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */ -+ - #define INTEL_SKL_GT3_IDS(info) \ -+ INTEL_SKL_ULT_GT3_IDS(info), \ - INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \ -- INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ - INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \ - INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ - INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */ -@@ -336,45 +392,91 @@ - INTEL_VGA_DEVICE(0x3184, info), \ - INTEL_VGA_DEVICE(0x3185, info) - --#define INTEL_KBL_GT1_IDS(info) \ -- INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \ -- INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \ -+#define INTEL_KBL_ULT_GT1_IDS(info) \ - INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \ -+ INTEL_VGA_DEVICE(0x5913, info) /* ULT GT1.5 */ -+ -+#define INTEL_KBL_ULX_GT1_IDS(info) \ - INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \ -+ INTEL_VGA_DEVICE(0x5915, info) /* ULX GT1.5 */ -+ -+#define INTEL_KBL_GT1_IDS(info) \ -+ INTEL_KBL_ULT_GT1_IDS(info), \ -+ INTEL_KBL_ULX_GT1_IDS(info), \ - INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \ - INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \ - INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \ - INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ - --#define INTEL_KBL_GT2_IDS(info) \ -+#define INTEL_KBL_ULT_GT2_IDS(info) \ - INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ -+ INTEL_VGA_DEVICE(0x5921, info) /* ULT GT2F */ -+ -+#define INTEL_KBL_ULX_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x591E, info) /* ULX GT2 */ -+ -+#define INTEL_KBL_GT2_IDS(info) \ -+ INTEL_KBL_ULT_GT2_IDS(info), \ -+ INTEL_KBL_ULX_GT2_IDS(info), \ - INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \ -- INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \ -- INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ - INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ - INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \ - INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ - -+#define INTEL_KBL_ULT_GT3_IDS(info) \ -+ INTEL_VGA_DEVICE(0x5926, info) /* ULT GT3 */ -+ - #define INTEL_KBL_GT3_IDS(info) \ -+ INTEL_KBL_ULT_GT3_IDS(info), \ - INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \ -- INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \ - INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */ - - #define INTEL_KBL_GT4_IDS(info) \ - INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ - - /* AML/KBL Y GT2 */ --#define INTEL_AML_GT2_IDS(info) \ -+#define INTEL_AML_KBL_GT2_IDS(info) \ - INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ - INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */ - -+/* AML/CFL Y GT2 */ -+#define INTEL_AML_CFL_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x87CA, info) -+ -+/* CML GT1 */ -+#define INTEL_CML_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x9BA5, info), \ -+ INTEL_VGA_DEVICE(0x9BA8, info), \ -+ INTEL_VGA_DEVICE(0x9BA4, info), \ -+ INTEL_VGA_DEVICE(0x9BA2, info) -+ -+#define INTEL_CML_U_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x9B21, info), \ -+ INTEL_VGA_DEVICE(0x9BAA, info), \ -+ INTEL_VGA_DEVICE(0x9BAC, info) -+ -+/* CML GT2 */ -+#define INTEL_CML_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x9BC5, info), \ -+ INTEL_VGA_DEVICE(0x9BC8, info), \ -+ INTEL_VGA_DEVICE(0x9BC4, info), \ -+ INTEL_VGA_DEVICE(0x9BC2, info), \ -+ INTEL_VGA_DEVICE(0x9BC6, info), \ -+ INTEL_VGA_DEVICE(0x9BE6, info), \ -+ INTEL_VGA_DEVICE(0x9BF6, info) -+ -+#define INTEL_CML_U_GT2_IDS(info) \ -+ INTEL_VGA_DEVICE(0x9B41, info), \ -+ INTEL_VGA_DEVICE(0x9BCA, info), \ -+ INTEL_VGA_DEVICE(0x9BCC, info) -+ - #define INTEL_KBL_IDS(info) \ - INTEL_KBL_GT1_IDS(info), \ - INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info), \ -- INTEL_AML_GT2_IDS(info) -+ INTEL_AML_KBL_GT2_IDS(info) - - /* CFL S */ - #define INTEL_CFL_S_GT1_IDS(info) \ -@@ -390,6 +492,9 @@ - INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */ - - /* CFL H */ -+#define INTEL_CFL_H_GT1_IDS(info) \ -+ INTEL_VGA_DEVICE(0x3E9C, info) -+ - #define INTEL_CFL_H_GT2_IDS(info) \ - INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \ - INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */ -@@ -407,30 +512,43 @@ - - /* WHL/CFL U GT1 */ - #define INTEL_WHL_U_GT1_IDS(info) \ -- INTEL_VGA_DEVICE(0x3EA1, info) -+ INTEL_VGA_DEVICE(0x3EA1, info), \ -+ INTEL_VGA_DEVICE(0x3EA4, info) - - /* WHL/CFL U GT2 */ - #define INTEL_WHL_U_GT2_IDS(info) \ -- INTEL_VGA_DEVICE(0x3EA0, info) -+ INTEL_VGA_DEVICE(0x3EA0, info), \ -+ INTEL_VGA_DEVICE(0x3EA3, info) - - /* WHL/CFL U GT3 */ - #define INTEL_WHL_U_GT3_IDS(info) \ -- INTEL_VGA_DEVICE(0x3EA2, info), \ -- INTEL_VGA_DEVICE(0x3EA3, info), \ -- INTEL_VGA_DEVICE(0x3EA4, info) -+ INTEL_VGA_DEVICE(0x3EA2, info) - - #define INTEL_CFL_IDS(info) \ - INTEL_CFL_S_GT1_IDS(info), \ - INTEL_CFL_S_GT2_IDS(info), \ -+ INTEL_CFL_H_GT1_IDS(info), \ - INTEL_CFL_H_GT2_IDS(info), \ - INTEL_CFL_U_GT2_IDS(info), \ - INTEL_CFL_U_GT3_IDS(info), \ - INTEL_WHL_U_GT1_IDS(info), \ - INTEL_WHL_U_GT2_IDS(info), \ -- INTEL_WHL_U_GT3_IDS(info) -+ INTEL_WHL_U_GT3_IDS(info), \ -+ INTEL_AML_CFL_GT2_IDS(info), \ -+ INTEL_CML_GT1_IDS(info), \ -+ INTEL_CML_GT2_IDS(info), \ -+ INTEL_CML_U_GT1_IDS(info), \ -+ INTEL_CML_U_GT2_IDS(info) - - /* CNL */ -+#define INTEL_CNL_PORT_F_IDS(info) \ -+ INTEL_VGA_DEVICE(0x5A54, info), \ -+ INTEL_VGA_DEVICE(0x5A5C, info), \ -+ INTEL_VGA_DEVICE(0x5A44, info), \ -+ INTEL_VGA_DEVICE(0x5A4C, info) -+ - #define INTEL_CNL_IDS(info) \ -+ INTEL_CNL_PORT_F_IDS(info), \ - INTEL_VGA_DEVICE(0x5A51, info), \ - INTEL_VGA_DEVICE(0x5A59, info), \ - INTEL_VGA_DEVICE(0x5A41, info), \ -@@ -440,22 +558,47 @@ - INTEL_VGA_DEVICE(0x5A42, info), \ - INTEL_VGA_DEVICE(0x5A4A, info), \ - INTEL_VGA_DEVICE(0x5A50, info), \ -- INTEL_VGA_DEVICE(0x5A40, info), \ -- INTEL_VGA_DEVICE(0x5A54, info), \ -- INTEL_VGA_DEVICE(0x5A5C, info), \ -- INTEL_VGA_DEVICE(0x5A44, info), \ -- INTEL_VGA_DEVICE(0x5A4C, info) -+ INTEL_VGA_DEVICE(0x5A40, info) - - /* ICL */ --#define INTEL_ICL_11_IDS(info) \ -+#define INTEL_ICL_PORT_F_IDS(info) \ - INTEL_VGA_DEVICE(0x8A50, info), \ -- INTEL_VGA_DEVICE(0x8A51, info), \ - INTEL_VGA_DEVICE(0x8A5C, info), \ -- INTEL_VGA_DEVICE(0x8A5D, info), \ -+ INTEL_VGA_DEVICE(0x8A59, info), \ -+ INTEL_VGA_DEVICE(0x8A58, info), \ - INTEL_VGA_DEVICE(0x8A52, info), \ - INTEL_VGA_DEVICE(0x8A5A, info), \ - INTEL_VGA_DEVICE(0x8A5B, info), \ -+ INTEL_VGA_DEVICE(0x8A57, info), \ -+ INTEL_VGA_DEVICE(0x8A56, info), \ - INTEL_VGA_DEVICE(0x8A71, info), \ -- INTEL_VGA_DEVICE(0x8A70, info) -+ INTEL_VGA_DEVICE(0x8A70, info), \ -+ INTEL_VGA_DEVICE(0x8A53, info), \ -+ INTEL_VGA_DEVICE(0x8A54, info) -+ -+#define INTEL_ICL_11_IDS(info) \ -+ INTEL_ICL_PORT_F_IDS(info), \ -+ INTEL_VGA_DEVICE(0x8A51, info), \ -+ INTEL_VGA_DEVICE(0x8A5D, info) -+ -+/* EHL/JSL */ -+#define INTEL_EHL_IDS(info) \ -+ INTEL_VGA_DEVICE(0x4500, info), \ -+ INTEL_VGA_DEVICE(0x4571, info), \ -+ INTEL_VGA_DEVICE(0x4551, info), \ -+ INTEL_VGA_DEVICE(0x4541, info), \ -+ INTEL_VGA_DEVICE(0x4E71, info), \ -+ INTEL_VGA_DEVICE(0x4E61, info), \ -+ INTEL_VGA_DEVICE(0x4E51, info) -+ -+/* TGL */ -+#define INTEL_TGL_12_IDS(info) \ -+ INTEL_VGA_DEVICE(0x9A49, info), \ -+ INTEL_VGA_DEVICE(0x9A40, info), \ -+ INTEL_VGA_DEVICE(0x9A59, info), \ -+ INTEL_VGA_DEVICE(0x9A60, info), \ -+ INTEL_VGA_DEVICE(0x9A68, info), \ -+ INTEL_VGA_DEVICE(0x9A70, info), \ -+ INTEL_VGA_DEVICE(0x9A78, info) - - #endif /* _I915_PCIIDS_H */ -diff --git a/src/intel_module.c b/src/intel_module.c -index a71c2e40b774..e0b94c190254 100644 ---- a/src/intel_module.c -+++ b/src/intel_module.c -@@ -357,7 +357,7 @@ static const struct pci_id_match intel_device_match[] = { - INTEL_I945GM_IDS(&intel_i945_info), - - INTEL_G33_IDS(&intel_g33_info), -- INTEL_PINEVIEW_IDS(&intel_g33_info), -+ INTEL_PINEVIEW_G_IDS(&intel_g33_info), - - INTEL_I965G_IDS(&intel_i965_info), - INTEL_I965GM_IDS(&intel_i965_info), -diff --git a/test/dri3-test.c b/test/dri3-test.c -index 78e105a8b64a..5265a30cea1b 100644 ---- a/test/dri3-test.c -+++ b/test/dri3-test.c -@@ -76,7 +76,7 @@ static const struct pci_id_match ids[] = { - INTEL_I945GM_IDS(031), - - INTEL_G33_IDS(033), -- INTEL_PINEVIEW_IDS(033), -+ INTEL_PINEVIEW_G_IDS(033), - - INTEL_I965G_IDS(040), - INTEL_I965GM_IDS(040), --- -2.17.1 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 7ab2236237..74ec57aa66 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -9,33 +9,30 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRCREV = "f66d39544bb8339130c96d282a80f87ca1606caf" +SRCREV = "31486f40f8e8f8923ca0799aea84b58799754564" PV = "2.99.917+git${SRCPV}" S = "${WORKDIR}/git" -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ - file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel;branch=master \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" -DEPENDS += "virtual/libx11 drm libpciaccess pixman" +DEPENDS += "virtual/libx11 drm libpciaccess pixman cairo libpng libxcb libxcomposite libxdamage libxrender libxrandr libxext libxfixes" -PACKAGECONFIG ??= "sna xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 dri3', '', d)}" +PACKAGECONFIG ??= "sna xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri2 dri3', '', d)}" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" -PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3" PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util" -PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxrender libxscrnsaver libxext libx11 pixman libxcb libxshmfence" +PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxcursor libxtst libxscrnsaver libxshmfence" # --enable-kms-only option is required by ROOTLESS_X EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -FILES_${PN} += "${datadir}/polkit-1" +FILES:${PN} += "${datadir}/polkit-1" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch deleted file mode 100644 index 9e01770667..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 29 Aug 2018 11:04:23 -0400 -Subject: [PATCH] Refuse to run on UEFI machines - -No possible good can come of this. - -v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer") -instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by -Peter Jones. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa] - -Reviewed-by: Peter Jones <pjones@redhat.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> ---- - src/vesa.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/vesa.c b/src/vesa.c -index 9b65b9b..af750e2 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -43,7 +43,7 @@ - #endif - - #include <string.h> -- -+#include <unistd.h> - #include "vesa.h" - - /* All drivers initialising the SW cursor need this */ -@@ -450,7 +450,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - intptr_t match_data) - { - ScrnInfoPtr pScrn; -- -+ -+#ifdef __linux__ -+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) { -+ ErrorF("vesa: Refusing to run on UEFI\n"); -+ return FALSE; -+ } -+#endif -+ - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { --- -2.20.1 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb index f6aa54456c..05bb905b35 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb @@ -13,11 +13,7 @@ DEPENDS += "virtual/libx11 xorgproto libpciaccess" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" +RRECOMMENDS:${PN} += "xserver-xorg-module-libint10" -SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6" -SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c" +SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659" -SRC_URI += " \ - file://0001-Refuse-to-run-on-UEFI-machines.patch \ - " diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch index 5bda720ce5..b37f697aa4 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch @@ -3,7 +3,7 @@ From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Fri, 9 Dec 2016 14:35:45 +0200 Subject: [PATCH] Add option for vmwgfx -Upstream-Status:Submitted +Upstream-Status: Submitted Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 493b90a298..8b3f19426b 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -2,15 +2,16 @@ SUMMARY = "X driver" HOMEPAGE = "http://www.x.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11/drivers" -LICENSE = "MIT-X" +LICENSE = "MIT" PE = "2" DEPENDS = "virtual/xserver xorgproto util-macros" -SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" +XORG_DRIVER_COMPRESSOR ?= ".tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}${XORG_DRIVER_COMPRESSOR}" -FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" +FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so" XORGBUILDCLASS ??= "autotools" inherit ${XORGBUILDCLASS} pkgconfig features_check @@ -20,7 +21,7 @@ REQUIRED_DISTRO_FEATURES = "x11" # FIXME: We don't want to include the libtool archives (*.la) from modules # directory, as they serve no useful purpose. Upstream should fix Makefile.am -do_install_append() { +do_install:append() { find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- } @@ -38,6 +39,6 @@ def _add_xorg_abi_depends(d, name): abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) pn = d.getVar("PN") - d.appendVar('RDEPENDS_' + pn, ' ' + abi) + d.appendVar('RDEPENDS:' + pn, ' ' + abi) SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc index 57912e70db..934c3d75c1 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc @@ -7,6 +7,6 @@ python add_xorg_abi_depends() { } PACKAGEFUNCS =+ "add_xorg_abi_depends" -FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ +FILES:${PN} += " ${libdir}/xorg/modules/input/*.so \ ${datadir}/X11/xorg.conf.d \ " |