diff options
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-driver')
6 files changed, 564 insertions, 60 deletions
diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch new file mode 100644 index 000000000..4bb7fb3e2 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch @@ -0,0 +1,51 @@ +This patch avoids using time field of input_event structure which is not available +on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new +and keeps old input.h implementation functional as well. + +See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/eventcomm.c ++++ b/src/eventcomm.c +@@ -575,10 +575,12 @@ SynapticsReadEvent(InputInfoPtr pInfo, s + ev->type = EV_SYN; + ev->code = SYN_REPORT; + ev->value = 0; +- ev->time = last_event_time; +- } else if (ev->type == EV_SYN) +- last_event_time = ev->time; +- ++ ev->input_event_sec = last_event_time.tv_sec; ++ ev->input_event_usec = last_event_time.tv_usec; ++ } else if (ev->type == EV_SYN) { ++ last_event_time.tv_sec = ev->input_event_sec; ++ last_event_time.tv_usec = ev->input_event_usec; ++ } + return TRUE; + } + +@@ -725,7 +727,7 @@ EventReadHwState(InputInfoPtr pInfo, + case SYN_REPORT: + hw->numFingers = count_fingers(pInfo, comm); + if (proto_data->have_monotonic_clock) +- hw->millis = 1000 * ev.time.tv_sec + ev.time.tv_usec / 1000; ++ hw->millis = 1000 * ev.input_event_sec + ev.input_event_usec / 1000; + else + hw->millis = GetTimeInMillis(); + SynapticsCopyHwState(hwRet, hw); +--- a/src/eventcomm.h ++++ b/src/eventcomm.h +@@ -34,6 +34,11 @@ + #include <xf86Xinput.h> + #include "synproto.h" + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + /* for auto-dev: */ + #define DEV_INPUT_EVENT "/dev/input" + #define EVENT_DEV_NAME "event" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb index dc31890f6..388350c96 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb @@ -10,6 +10,8 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" +SRC_URI += "file://64bit_time_t_support.patch" + SRC_URI[md5sum] = "cfb79d3c975151f9bbf30b727c260cb9" SRC_URI[sha256sum] = "7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch new file mode 100644 index 000000000..ef3b1afb1 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Sync-i915_pciids-upto-8717c6b7414f.patch @@ -0,0 +1,505 @@ +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/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch deleted file mode 100644 index 52916f8b4..000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 6 Mar 2018 12:07:46 -0500 -Subject: [PATCH] Fix build on i686 - -Presumably this only matters for i686 because amd64 implies sse2, but: - -BUILDSTDERR: In file included from gen4_vertex.c:34: -BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': -BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch -BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) -BUILDSTDERR: ^~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:308:25: note: called from here -BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ -BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' -BUILDSTDERR: OUT_VERTEX(dstX, dstY); -BUILDSTDERR: ^~~~~~~~~~ - -The bug here appears to be that emit_vertex() is declared 'sse2' but -vertex_emit_2s is merely always_inline. gcc8 decides that since you said -always_inline you need to have explicitly cloned it for every -permutation of targets. Merely saying inline seems to do the job of -cloning vertex_emit_2s as much as necessary. - -So to reiterate: if you say always-inline, it won't, but if you just say -maybe inline, it will. Thanks gcc, that's helpful. - -- ajax - -Patch taken from Fedora. - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - ---- - src/sna/compiler.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 3c176a16..bc447c7a 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -32,7 +32,7 @@ - #define likely(expr) (__builtin_expect (!!(expr), 1)) - #define unlikely(expr) (__builtin_expect (!!(expr), 0)) - #define noinline __attribute__((noinline)) --#define force_inline inline __attribute__((always_inline)) -+#define force_inline inline - #define fastcall __attribute__((regparm(3))) - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) --- -2.16.2 - diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index bf9009bda..7ab223623 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -9,14 +9,13 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRCREV = "33ee0c3b21ea279e08d0863fcb2e874f0974b00e" +SRCREV = "f66d39544bb8339130c96d282a80f87ca1606caf" PV = "2.99.917+git${SRCPV}" S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ - " - -SRC_URI_append_qemux86 = "file://01_Fix-build-on-i686.patch" + file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 54f04b11e..e30f04472 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -13,7 +13,9 @@ SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" -inherit autotools pkgconfig features_check +XORGBUILDCLASS ??= "autotools" +inherit ${XORGBUILDCLASS} pkgconfig features_check + # depends on virtual/xserver REQUIRED_DISTRO_FEATURES = "x11" |