From ae3ab75cd4c84b65b7344470ba9ae1d45df15104 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 8 Dec 2020 09:12:57 -0500 Subject: meta-agl-bsp: Update i.MX8MQ EVK support for latest dunfell The layer updates to go to the latest 3.1.4 Yocto dunfell release broke the imx8mqevk and imx8mqevk-viv builds, though for different reasons. imx8mqevk fixes: - Remove the now upstreamed etnaviv kernel patches that had been backported by Walter. - Turn off btrfs support in the linux-fslc-imx kernel configuration. This is required due to meta-freescale having a 5.4 kernel new enough to need a lttng-modules fix for btrfs that has not yet been backported from the Yocto master branch to dunfell. - Update the PREFERRED_VERSION over-rides in agl_imx8mqevk.inc to match the new versions of libdrm and gstreamer in poky. imx8mqevk-viv fixes: - Add weston_8.0.0.imx.bbappend to work around the broken addition of a PACKAGECONFIG_remove of "x11 wayland" in the recipe in meta-freescale. Upstream will be engaged to drive getting the change reverted. Bug-AGL: SPEC-3725 Signed-off-by: Scott Murray Change-Id: I259f2d048a9de653a0060afcef17c4410093783a Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25772 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Tadao Tanikawa --- ...ed-Fix-passing-zero-to-PTR_ERR-warning-v2.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx/0004-drm-sched-Fix-passing-zero-to-PTR_ERR-warning-v2.patch (limited to 'meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx/0004-drm-sched-Fix-passing-zero-to-PTR_ERR-warning-v2.patch') diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx/0004-drm-sched-Fix-passing-zero-to-PTR_ERR-warning-v2.patch b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx/0004-drm-sched-Fix-passing-zero-to-PTR_ERR-warning-v2.patch deleted file mode 100644 index 8c141a0f5..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx/0004-drm-sched-Fix-passing-zero-to-PTR_ERR-warning-v2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d7c5782acd354bdb5ed0fa10e1e397eaed558390 Mon Sep 17 00:00:00 2001 -From: Andrey Grodzovsky -Date: Tue, 29 Oct 2019 11:03:05 -0400 -Subject: [PATCH] drm/sched: Fix passing zero to 'PTR_ERR' warning v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix a static code checker warning. - -v2: Drop PTR_ERR_OR_ZERO. - -Signed-off-by: Andrey Grodzovsky -Reviewed-by: Emily Deng -Reviewed-by: Christian König -Signed-off-by: Alex Deucher ---- - drivers/gpu/drm/scheduler/sched_main.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c -index 2af64459b3d7..fbb6446c4f69 100644 ---- a/drivers/gpu/drm/scheduler/sched_main.c -+++ b/drivers/gpu/drm/scheduler/sched_main.c -@@ -496,8 +496,10 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched) - fence = sched->ops->run_job(s_job); - - if (IS_ERR_OR_NULL(fence)) { -+ if (IS_ERR(fence)) -+ dma_fence_set_error(&s_fence->finished, PTR_ERR(fence)); -+ - s_job->s_fence->parent = NULL; -- dma_fence_set_error(&s_fence->finished, PTR_ERR(fence)); - } else { - s_job->s_fence->parent = fence; - } -@@ -746,8 +748,9 @@ static int drm_sched_main(void *param) - r); - dma_fence_put(fence); - } else { -+ if (IS_ERR(fence)) -+ dma_fence_set_error(&s_fence->finished, PTR_ERR(fence)); - -- dma_fence_set_error(&s_fence->finished, PTR_ERR(fence)); - drm_sched_process_job(NULL, &sched_job->cb); - } - --- -2.20.1 - -- cgit 1.2.3-korg