diff options
Diffstat (limited to 'common')
5 files changed, 60 insertions, 41 deletions
diff --git a/common/recipes-graphics/xorg-driver/xorg-driver-common.inc b/common/recipes-graphics/xorg-driver/xorg-driver-common.inc deleted file mode 100644 index 1ed2742d..00000000 --- a/common/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | DESCRIPTION = "X driver" | ||
2 | HOMEPAGE = "http://www.x.org" | ||
3 | BUGTRACKER = "https://bugs.freedesktop.org" | ||
4 | SECTION = "x11/drivers" | ||
5 | LICENSE = "MIT-X" | ||
6 | |||
7 | PE = "2" | ||
8 | INC_PR = "r0" | ||
9 | |||
10 | DEPENDS = "virtual/xserver xproto randrproto util-macros" | ||
11 | |||
12 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" | ||
13 | |||
14 | S = "${WORKDIR}/${BPN}-${PV}" | ||
15 | |||
16 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" | ||
17 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement | ||
22 | # macro that simply assumes the test succeeds. | ||
23 | do_configure_prepend () { | ||
24 | echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new | ||
25 | sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new | ||
26 | mv configure.ac.new configure.ac | ||
27 | } | ||
28 | |||
29 | # FIXME: We don't want to include the libtool archives (*.la) from modules | ||
30 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am | ||
31 | do_install_append() { | ||
32 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- | ||
33 | } | ||
diff --git a/common/recipes-graphics/xorg-driver/xorg-driver-video.inc b/common/recipes-graphics/xorg-driver/xorg-driver-video.inc deleted file mode 100644 index 57c80d10..00000000 --- a/common/recipes-graphics/xorg-driver/xorg-driver-video.inc +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | include xorg-driver-common.inc | ||
2 | |||
3 | DEPENDS =+ "renderproto videoproto xextproto fontsproto" | ||
4 | |||
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index 0c384745..6c3d784e 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | |||
7 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 7 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
8 | KBRANCH_core2-32-intel-common = "standard/base" | 8 | KBRANCH_core2-32-intel-common = "standard/base" |
9 | SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" | 9 | SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
10 | SRCREV_machine_core2-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" | 10 | SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" |
11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
12 | 12 | ||
13 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" | 13 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" |
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | |||
15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
16 | KBRANCH_corei7-64-intel-common = "standard/base" | 16 | KBRANCH_corei7-64-intel-common = "standard/base" |
17 | SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" | 17 | SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
18 | SRCREV_machine_corei7-64-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" | 18 | SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
20 | 20 | ||
21 | # Quark / X1000 BSP Info | 21 | # Quark / X1000 BSP Info |
@@ -24,7 +24,7 @@ COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | |||
24 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | 24 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" |
25 | KBRANCH_i586-nlp-32-intel-common = "standard/base" | 25 | KBRANCH_i586-nlp-32-intel-common = "standard/base" |
26 | SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" | 26 | SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" |
27 | SRCREV_machine_i586-nlp-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" | 27 | SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" |
28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | 28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" |
29 | 29 | ||
30 | 30 | ||
diff --git a/common/recipes-multimedia/libva/libva-intel-driver/Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch b/common/recipes-multimedia/libva/libva-intel-driver/Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch new file mode 100644 index 00000000..aa98a200 --- /dev/null +++ b/common/recipes-multimedia/libva/libva-intel-driver/Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Upstream-Status: Backport (from git://anongit.freedesktop.org/vaapi/intel-driver with commit id 4307780b648245aba4ff338dcfe0172dec2e12e9) | ||
2 | Signed-off-by: Azril Ahmad <mohd.azril.ahmad@intel.com> | ||
3 | |||
4 | |||
5 | From dff0614a65693bdfbcf8a46ccfb52f036647bb93 Mon Sep 17 00:00:00 2001 | ||
6 | From: "Xiang, Haihao" <haihao.xiang@intel.com> | ||
7 | Date: Tue, 27 Jan 2015 11:09:02 +0800 | ||
8 | Subject: [PATCH 06/10] Use VMask instead of DMask in 3DSTATE_PS on GEN8+ | ||
9 | |||
10 | Mesa uses VMask instead of DMask in 3DSTATE_PS. | ||
11 | "Initialize the execution mask with VMask. Otherwise, derivatives are | ||
12 | incorrect for subspans where some of the pixels are unlit. We believe | ||
13 | the bit just didn't take effect in previous generations." | ||
14 | |||
15 | To avoid potential issue, use VMask in libva too. | ||
16 | |||
17 | Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> | ||
18 | Reviewed-by: Sean V Kelley <sean.v.kelley@intel.com> | ||
19 | --- | ||
20 | src/gen8_render.c | 3 ++- | ||
21 | src/gen9_render.c | 3 ++- | ||
22 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/src/gen8_render.c b/src/gen8_render.c | ||
25 | index 8a8012d..65a66c5 100644 | ||
26 | --- a/src/gen8_render.c | ||
27 | +++ b/src/gen8_render.c | ||
28 | @@ -1447,7 +1447,8 @@ gen8_emit_wm_state(VADriverContextP ctx, int kernel) | ||
29 | /* DW3. PS shader flag .Binding table cnt/sample cnt */ | ||
30 | OUT_BATCH(batch, | ||
31 | (1 << GEN7_PS_SAMPLER_COUNT_SHIFT) | | ||
32 | - (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT)); | ||
33 | + (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT) | | ||
34 | + GEN7_PS_VECTOR_MASK_ENABLE); | ||
35 | /* DW4-5. Scatch space */ | ||
36 | OUT_BATCH(batch, 0); /* scratch space base offset */ | ||
37 | OUT_BATCH(batch, 0); | ||
38 | diff --git a/src/gen9_render.c b/src/gen9_render.c | ||
39 | index da8950e..89935f2 100644 | ||
40 | --- a/src/gen9_render.c | ||
41 | +++ b/src/gen9_render.c | ||
42 | @@ -1449,7 +1449,8 @@ gen9_emit_wm_state(VADriverContextP ctx, int kernel) | ||
43 | /* DW3. PS shader flag .Binding table cnt/sample cnt */ | ||
44 | OUT_BATCH(batch, | ||
45 | (1 << GEN7_PS_SAMPLER_COUNT_SHIFT) | | ||
46 | - (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT)); | ||
47 | + (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT) | | ||
48 | + GEN7_PS_VECTOR_MASK_ENABLE); | ||
49 | /* DW4-5. Scatch space */ | ||
50 | OUT_BATCH(batch, 0); /* scratch space base offset */ | ||
51 | OUT_BATCH(batch, 0); | ||
52 | -- | ||
53 | 2.1.0 | ||
54 | |||
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.bb index ba09c2c6..dfb1ec1a 100644 --- a/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.bb +++ b/common/recipes-multimedia/libva/libva-intel-driver_1.5.0.bb | |||
@@ -14,7 +14,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | |||
14 | DEPENDS = "libva libdrm" | 14 | DEPENDS = "libva libdrm" |
15 | 15 | ||
16 | SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2" | 16 | SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2" |
17 | SRC_URI += "file://wayland-include.patch" | 17 | SRC_URI += "file://wayland-include.patch \ |
18 | file://Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch \ | ||
19 | " | ||
18 | 20 | ||
19 | SRC_URI[md5sum] = "16752f1584398265072129553b7907ce" | 21 | SRC_URI[md5sum] = "16752f1584398265072129553b7907ce" |
20 | SRC_URI[sha256sum] = "d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc" | 22 | SRC_URI[sha256sum] = "d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc" |