From 258296f9d1bb91d219e8301841e132352d4c6328 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 7 Oct 2015 21:45:10 +0100 Subject: xorg-driver: remove duplicate files from oe-core These files are copies of files from oe-core, delete them as they are unused. Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- .../xorg-driver/xorg-driver-common.inc | 33 ---------------------- .../xorg-driver/xorg-driver-video.inc | 4 --- 2 files changed, 37 deletions(-) delete mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-common.inc delete mode 100644 common/recipes-graphics/xorg-driver/xorg-driver-video.inc (limited to 'common') 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 @@ -DESCRIPTION = "X driver" -HOMEPAGE = "http://www.x.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11/drivers" -LICENSE = "MIT-X" - -PE = "2" -INC_PR = "r0" - -DEPENDS = "virtual/xserver xproto randrproto util-macros" - -SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${BPN}-${PV}" - -FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" - -inherit autotools pkgconfig - -# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement -# macro that simply assumes the test succeeds. -do_configure_prepend () { - echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new - sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new - mv configure.ac.new configure.ac -} - -# 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() { - find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- -} 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 @@ -include xorg-driver-common.inc - -DEPENDS =+ "renderproto videoproto xextproto fontsproto" - -- cgit v1.2.3-54-g00ecf From 1a3cd03c918ca62f6a67c7407d5656e7792969ad Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 19 Oct 2015 09:22:49 -0700 Subject: linux-yocto-4.1: Update SRCREV to include additional patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dbe692d Ville Syrjälä drm/i915: Fix the VBT child device parsing for BSW 52a4a9f Michel Thierry drm/i915/gen8: Initialize page tables a95cb62f Michel Thierry drm/i915: Remove unnecessary gen8_ppgtt_unmap_pages a24d98f Michel Thierry drm/i915: Remove _entry from PPGTT page structures a8abc11 Ville Syrjälä drm/i915: Only wait for required lanes in vlv_wait_port_ready() 8135418 Ville Syrjälä Revert drm/i915: Hack to tie both common lanes together on chv d660fc1 Ville Syrjälä drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV 0e797e9 Ville Syrjälä drm/i915: Implement chv display PHY lane stagger setup Signed-off-by: Saul Wold --- common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common') 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}" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/base" SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" -SRCREV_machine_core2-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" +SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" LINUX_VERSION_corei7-64-intel-common = "4.1.8" @@ -15,7 +15,7 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" KMACHINE_corei7-64-intel-common = "intel-corei7-64" KBRANCH_corei7-64-intel-common = "standard/base" SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" -SRCREV_machine_corei7-64-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" +SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # Quark / X1000 BSP Info @@ -24,7 +24,7 @@ COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" KMACHINE_i586-nlp-32-intel-common = "intel-quark" KBRANCH_i586-nlp-32-intel-common = "standard/base" SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e" -SRCREV_machine_i586-nlp-32-intel-common ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" +SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" -- cgit v1.2.3-54-g00ecf From 9bdc2090ca821c6b43ec4e69ee9ac6a34dd35ca3 Mon Sep 17 00:00:00 2001 From: Azril Ahmad Date: Fri, 23 Oct 2015 11:48:40 +0800 Subject: libva-intel-driver: Fix timestamping issue for VC1/WMV VAAPI decode under BSW CHV Include the upstreamed patch to fix the timestamping issue that observed during the WMV/VC1 VAAPI decode under GStreamer on BSW CHV. The patch was imported from FreeDesktop VAAPI git server (git://anongit.freedesktop.org/vaapi/intel-driver) as of commit id 4307780b648245aba4ff338dcfe0172dec2e12e9 Signed-off-by: Azril Ahmad Signed-off-by: Saul Wold --- ...sk-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch | 54 ++++++++++++++++++++++ .../libva/libva-intel-driver_1.5.0.bb | 4 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 common/recipes-multimedia/libva/libva-intel-driver/Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch (limited to 'common') 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 @@ +Upstream-Status: Backport (from git://anongit.freedesktop.org/vaapi/intel-driver with commit id 4307780b648245aba4ff338dcfe0172dec2e12e9) +Signed-off-by: Azril Ahmad + + +From dff0614a65693bdfbcf8a46ccfb52f036647bb93 Mon Sep 17 00:00:00 2001 +From: "Xiang, Haihao" +Date: Tue, 27 Jan 2015 11:09:02 +0800 +Subject: [PATCH 06/10] Use VMask instead of DMask in 3DSTATE_PS on GEN8+ + +Mesa uses VMask instead of DMask in 3DSTATE_PS. + "Initialize the execution mask with VMask. Otherwise, derivatives are + incorrect for subspans where some of the pixels are unlit. We believe + the bit just didn't take effect in previous generations." + +To avoid potential issue, use VMask in libva too. + +Signed-off-by: Xiang, Haihao +Reviewed-by: Sean V Kelley +--- + src/gen8_render.c | 3 ++- + src/gen9_render.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/gen8_render.c b/src/gen8_render.c +index 8a8012d..65a66c5 100644 +--- a/src/gen8_render.c ++++ b/src/gen8_render.c +@@ -1447,7 +1447,8 @@ gen8_emit_wm_state(VADriverContextP ctx, int kernel) + /* DW3. PS shader flag .Binding table cnt/sample cnt */ + OUT_BATCH(batch, + (1 << GEN7_PS_SAMPLER_COUNT_SHIFT) | +- (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT)); ++ (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT) | ++ GEN7_PS_VECTOR_MASK_ENABLE); + /* DW4-5. Scatch space */ + OUT_BATCH(batch, 0); /* scratch space base offset */ + OUT_BATCH(batch, 0); +diff --git a/src/gen9_render.c b/src/gen9_render.c +index da8950e..89935f2 100644 +--- a/src/gen9_render.c ++++ b/src/gen9_render.c +@@ -1449,7 +1449,8 @@ gen9_emit_wm_state(VADriverContextP ctx, int kernel) + /* DW3. PS shader flag .Binding table cnt/sample cnt */ + OUT_BATCH(batch, + (1 << GEN7_PS_SAMPLER_COUNT_SHIFT) | +- (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT)); ++ (5 << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT) | ++ GEN7_PS_VECTOR_MASK_ENABLE); + /* DW4-5. Scatch space */ + OUT_BATCH(batch, 0); /* scratch space base offset */ + OUT_BATCH(batch, 0); +-- +2.1.0 + 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' DEPENDS = "libva libdrm" SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${BPN}/${BPN}-${PV}.tar.bz2" -SRC_URI += "file://wayland-include.patch" +SRC_URI += "file://wayland-include.patch \ + file://Use-VMask-instead-of-DMask-in-3DSTATE_PS-on-GEN8.patch \ + " SRC_URI[md5sum] = "16752f1584398265072129553b7907ce" SRC_URI[sha256sum] = "d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc" -- cgit v1.2.3-54-g00ecf