diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-graphics/xorg-driver/xf86-video-intel | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-driver/xf86-video-intel')
3 files changed, 157 insertions, 0 deletions
diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch new file mode 100644 index 000000000..06ef10501 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch @@ -0,0 +1,116 @@ +From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001 +From: Liwei Song <liwei.song@windriver.com> +Date: Wed, 22 Nov 2017 08:59:03 +0000 +Subject: [PATCH] Add Coffeelake PCI IDs for S Skus + +Add the Coffeelake PCI IDs based on the following kernel patches: + +commit b056f8f3d6b900e8afd19f312719160346d263b4 +Author: Anusha Srivatsa <anusha.srivatsa@intel.com> +Date: Thu Jun 8 16:41:05 2017 -0700 + + drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. + +Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10139905] + +Signed-off-by: Liwei Song <liwei.song@windriver.com> +--- + src/i915_pciids.h | 7 +++++++ + src/intel_module.c | 13 +++++++++++++ + src/sna/gen9_render.c | 12 ++++++++++++ + 3 files changed, 32 insertions(+) + +diff --git a/src/i915_pciids.h b/src/i915_pciids.h +index 0370f830c541..11ccfa9c047a 100644 +--- a/src/i915_pciids.h ++++ b/src/i915_pciids.h +@@ -340,4 +340,11 @@ + INTEL_VGA_DEVICE(0x3184, info), \ + INTEL_VGA_DEVICE(0x3185, info) + ++#define INTEL_CFL_S_IDS(info) \ ++ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ ++ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ ++ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ ++ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ ++ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ ++ + #endif /* _I915_PCIIDS_H */ +diff --git a/src/intel_module.c b/src/intel_module.c +index 6b04857e2853..4827a67255f0 100644 +--- a/src/intel_module.c ++++ b/src/intel_module.c +@@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = { + .gen = 0113, + }; + ++static const struct intel_device_info intel_coffeelake_info = { ++ .gen = 0114, ++}; ++ + static const SymTabRec intel_chipsets[] = { + {PCI_CHIP_I810, "i810"}, + {PCI_CHIP_I810_DC100, "i810-dc100"}, +@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = { + {0x5916, "HD Graphics 620"}, + {0x591E, "HD Graphics 615"}, + ++ /*Coffeelake*/ ++ {0x3E90, "HD Graphics"}, ++ {0x3E93, "HD Graphics"}, ++ {0x3E91, "HD Graphics"}, ++ {0x3E92, "HD Graphics"}, ++ {0x3E96, "HD Graphics"}, ++ + /* When adding new identifiers, also update: + * 1. intel_identify() + * 2. man/intel.man +@@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = { + + INTEL_GLK_IDS(&intel_geminilake_info), + ++ INTEL_CFL_S_IDS(&intel_coffeelake_info), ++ + INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), + #endif + +diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c +index e5f12c723956..7f49052c5ec1 100644 +--- a/src/sna/gen9_render.c ++++ b/src/sna/gen9_render.c +@@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = { + .urb = { .max_vs_entries = 320 }, + }; + ++static const struct gt_info cfl_gt_info = { ++ .name = "Coffeelake (gen9)", ++ .urb = { .max_vs_entries = 960 }, ++}; ++ + static bool is_skl(struct sna *sna) + { + return sna->kgem.gen == 0110; +@@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna) + return sna->kgem.gen == 0113; + } + ++static bool is_cfl(struct sna *sna) ++{ ++ return sna->kgem.gen == 0114; ++} ++ + + static inline bool too_large(int width, int height) + { +@@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna) + state->info = &kbl_gt_info; + if (is_glk(sna)) + state->info = &glk_gt_info; ++ if (is_cfl(sna)) ++ state->info = &cfl_gt_info; + + sna_static_stream_init(&general); + +-- +2.13.3 + diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch new file mode 100644 index 000000000..8a5dd39ae --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch @@ -0,0 +1,24 @@ +Include xorg-server.h to fix build errors seen with glibc 2.20 + +In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, + from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39: +/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + ^ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending + +Index: xf86-video-intel-2.99.912/src/backlight.c +=================================================================== +--- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700 ++++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700 +@@ -29,6 +29,7 @@ + #include "config.h" + #endif + ++#include <xorg-server.h> + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/stat.h> diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch new file mode 100644 index 000000000..3dddd334b --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch @@ -0,0 +1,17 @@ +These modules are only used for tests that don't get installed, and the +automatic detection without explicit dependencies means that a build can find +e.g. xshmfence at configure time but then it's been removed from the sysroot by +the time compile happens. + +As the tests don't get installed, just disable the checks. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/configure.ac b/configure.ac +index bd654f3..78a0e0d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279 +279 @@ fi +-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) ++#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) |