On Sat, Oct 7, 2017 at 2:57 AM, Nathan Rossi <nat...@nathanrossi.com> wrote:
> Update the arm-trusted-firmware, pmu-firmware, u-boot-xlnx, linux-xlnx,
> qemu-xilinx and qemu-devicetrees recipes for to the 'xilinx-v2017.3'
> release tags.
>
> Drop/update existing patches where applicable.
>
> Signed-off-by: Nathan Rossi <nat...@nathanrossi.com>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Thanks,
Alistair
> ---
> .../arm-trusted-firmware_2017.1.bb | 9 ----
> .../arm-trusted-firmware_2017.3.bb | 6 +++
> ...-Resolve-GCC-static-analysis-false-positi.patch | 49
> ----------------------
> ...zynqmp-Remove-duplicate-const-declaration.patch | 30 -------------
> ...u-firmware_2017.1.bb => pmu-firmware_2017.3.bb} | 6 +--
> ...xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch | 0
> ...u-boot-xlnx_2017.1.bb => u-boot-xlnx_2017.3.bb} | 8 ++--
> ...etrees_2017.1.bb => qemu-devicetrees_2017.3.bb} | 2 +-
> ...qemu-xilinx_2017.1.bb => qemu-xilinx_2017.3.bb} | 2 +-
> recipes-kernel/linux/linux-xlnx.inc | 2 +-
> ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 19 +++++----
> ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 4 +-
> ...0003-drm-xilinx-Fix-DPMS-transition-to-on.patch | 29 ++++---------
> .../{linux-xlnx_2017.1.bb => linux-xlnx_2017.3.bb} | 4 +-
> 14 files changed, 40 insertions(+), 130 deletions(-)
> delete mode 100644
> recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
> create mode 100644
> recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb
> delete mode 100644
> recipes-bsp/arm-trusted-firmware/files/psci_common-Resolve-GCC-static-analysis-false-positi.patch
> delete mode 100644
> recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
> rename recipes-bsp/pmu-firmware/{pmu-firmware_2017.1.bb =>
> pmu-firmware_2017.3.bb} (95%)
> rename recipes-bsp/u-boot/u-boot-xlnx/{v2017.1 =>
> v2017.3}/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch (100%)
> rename recipes-bsp/u-boot/{u-boot-xlnx_2017.1.bb => u-boot-xlnx_2017.3.bb}
> (74%)
> rename recipes-devtools/qemu/{qemu-devicetrees_2017.1.bb =>
> qemu-devicetrees_2017.3.bb} (94%)
> rename recipes-devtools/qemu/{qemu-xilinx_2017.1.bb =>
> qemu-xilinx_2017.3.bb} (95%)
> rename recipes-kernel/linux/linux-xlnx/{4.9 =>
> v2017.3}/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (95%)
> rename recipes-kernel/linux/linux-xlnx/{4.9 =>
> v2017.3}/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (99%)
> rename recipes-kernel/linux/linux-xlnx/{4.9 =>
> v2017.3}/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (66%)
> rename recipes-kernel/linux/{linux-xlnx_2017.1.bb => linux-xlnx_2017.3.bb}
> (75%)
>
> diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
> b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
> deleted file mode 100644
> index e68e5cfbf9..0000000000
> --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -include arm-trusted-firmware.inc
> -
> -XILINX_RELEASE_VERSION = "v2017.1"
> -SRCREV ?= "7d1a6732c9ae113999aeabcb9912369760d05c13"
> -
> -PV = "1.3-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
> -
> -SRC_URI += "file://zynqmp-Remove-duplicate-const-declaration.patch"
> -SRC_URI +=
> "file://psci_common-Resolve-GCC-static-analysis-false-positi.patch"
> diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb
> b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb
> new file mode 100644
> index 0000000000..9bf5cacfab
> --- /dev/null
> +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb
> @@ -0,0 +1,6 @@
> +include arm-trusted-firmware.inc
> +
> +XILINX_RELEASE_VERSION = "v2017.3"
> +SRCREV ?= "f9b244beaa7ac6a670b192192b6e92e5fd6044dc"
> +
> +PV = "1.3-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
> diff --git
> a/recipes-bsp/arm-trusted-firmware/files/psci_common-Resolve-GCC-static-analysis-false-positi.patch
>
> b/recipes-bsp/arm-trusted-firmware/files/psci_common-Resolve-GCC-static-analysis-false-positi.patch
> deleted file mode 100644
> index bc9bf61cf4..0000000000
> ---
> a/recipes-bsp/arm-trusted-firmware/files/psci_common-Resolve-GCC-static-analysis-false-positi.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -From 8596a87e75421016b83ed7f2ffb342114f48b5ca Mon Sep 17 00:00:00 2001
> -From: Alistair Francis <alistair.fran...@xilinx.com>
> -Date: Wed, 23 Aug 2017 13:55:21 -0700
> -Subject: [PATCH] psci_common: Resolve GCC static analysis false positive
> -
> -Previously commit 555ebb34db8f3424c1b394df2f10ecf9c1f70901 attmpted to fix
> this
> -GCC issue:
> -
> -services/std_svc/psci/psci_common.c: In function
> 'psci_do_state_coordination':
> -services/std_svc/psci/psci_common.c:220:27: error: array subscript is above
> -array bounds [-Werror=array-bounds]
> - psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
> -
> -This fix doesn't work as asserts aren't built in non-debug build flows.
> -
> -Let's use GCCs #pragma option (documented here:
> -https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html) to avoid
> -this false positive instead.
> -
> -Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
> ----
> -Upstream Status: Accepted in mainline, pending for 2017.3
> -
> - lib/psci/psci_common.c | 7 +++++++
> - 1 file changed, 7 insertions(+)
> -
> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c
> -index 68cdd6eb..3843d4df 100644
> ---- a/lib/psci/psci_common.c
> -+++ b/lib/psci/psci_common.c
> -@@ -216,8 +216,15 @@ static void psci_set_req_local_pwr_state(unsigned int
> pwrlvl,
> - unsigned int cpu_idx,
> - plat_local_state_t req_pwr_state)
> - {
> -+ /*
> -+ * This should never happen, we have this here to avoid
> -+ * "array subscript is above array bounds" errors in GCC.
> -+ */
> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
> -+#pragma GCC diagnostic push
> -+#pragma GCC diagnostic ignored "-Warray-bounds"
> - psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
> -+#pragma GCC diagnostic pop
> - }
> -
> -
> /******************************************************************************
> ---
> -2.11.0
> -
> diff --git
> a/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
>
> b/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
> deleted file mode 100644
> index aeb5a2035f..0000000000
> ---
> a/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From a97f6272b7a7a8e3249df34c22479b3893746395 Mon Sep 17 00:00:00 2001
> -From: Soren Brinkmann <soren.brinkm...@xilinx.com>
> -Date: Sat, 1 Jul 2017 20:24:47 -0700
> -Subject: [PATCH] zynqmp: Remove duplicate 'const' declaration
> -
> -Fixing compilation errors due to duplicate 'const' keyword:
> - plat/xilinx/zynqmp/pm_service/pm_client.c:39:29: error: duplicate 'const'
> declaration specifier [-Werror=duplicate-decl-specifier]
> - static const struct pm_proc const pm_procs_all[] = {
> - ^~~~~
> -
> -Signed-off-by: Soren Brinkmann <soren.brinkm...@xilinx.com>
> ----
> -Upstream Status: Accepted for 2017.3
> -
> - plat/xilinx/zynqmp/pm_service/pm_client.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c
> b/plat/xilinx/zynqmp/pm_service/pm_client.c
> -index f11725d78..08369b99e 100644
> ---- a/plat/xilinx/zynqmp/pm_service/pm_client.c
> -+++ b/plat/xilinx/zynqmp/pm_service/pm_client.c
> -@@ -31,7 +31,7 @@ DEFINE_BAKERY_LOCK(pm_client_secure_lock);
> - extern const struct pm_ipi apu_ipi;
> -
> - /* Order in pm_procs_all array must match cpu ids */
> --static const struct pm_proc const pm_procs_all[] = {
> -+static const struct pm_proc pm_procs_all[] = {
> - {
> - .node_id = NODE_APU_0,
> - .pwrdn_mask = APU_0_PWRCTL_CPUPWRDWNREQ_MASK,
> diff --git a/recipes-bsp/pmu-firmware/pmu-firmware_2017.1.bb
> b/recipes-bsp/pmu-firmware/pmu-firmware_2017.3.bb
> similarity index 95%
> rename from recipes-bsp/pmu-firmware/pmu-firmware_2017.1.bb
> rename to recipes-bsp/pmu-firmware/pmu-firmware_2017.3.bb
> index ee68617fe9..aceadf7bd7 100644
> --- a/recipes-bsp/pmu-firmware/pmu-firmware_2017.1.bb
> +++ b/recipes-bsp/pmu-firmware/pmu-firmware_2017.3.bb
> @@ -19,12 +19,12 @@ append_target_provides[eventmask] =
> "bb.event.RecipeParsed"
> # itself is licensed under a modified MIT license which restricts use to
> Xilinx
> # devices only.
> LICENSE = "Proprietary"
> -LIC_FILES_CHKSUM =
> "file://../../../../license.txt;md5=8c0025a6b0e91b4ab8e4ba9f6d2fb65c"
> +LIC_FILES_CHKSUM =
> "file://../../../../license.txt;md5=530190e8d7ebcdfeddbe396f3f20417f"
>
> inherit deploy
>
> -XILINX_RELEASE_VERSION = "v2017.1"
> -SRCREV = "3813f14966bd69e7e1d59943d2a58c64efafa17b"
> +XILINX_RELEASE_VERSION = "v2017.3"
> +SRCREV = "3c9f0cfde9307c2dc1a298f9f22d492601232821"
> PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
>
> SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
> diff --git
> a/recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
>
> b/recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
> similarity index 100%
> rename from
> recipes-bsp/u-boot/u-boot-xlnx/v2017.1/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
> rename to
> recipes-bsp/u-boot/u-boot-xlnx/v2017.3/arm-zynqmp-xilinx_zynqmp.h-Auto-boot-in-JTAG-if-imag.patch
> diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb
> b/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb
> similarity index 74%
> rename from recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb
> rename to recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb
> index d70dfefd76..cc59258de0 100644
> --- a/recipes-bsp/u-boot/u-boot-xlnx_2017.1.bb
> +++ b/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb
> @@ -1,8 +1,8 @@
> include u-boot-xlnx.inc
> include u-boot-spl-zynq-init.inc
>
> -XILINX_RELEASE_VERSION = "v2017.1"
> -SRCREV = "92e3dd638b50ad22dd90072673c80d8730903e95"
> +XILINX_RELEASE_VERSION = "v2017.3"
> +SRCREV ?= "da811c4511ef9caeb95f9a22fe49d38bd8e56ded"
> PV = "v2017.01-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
>
> SRC_URI_append = " \
> @@ -12,13 +12,13 @@ SRC_URI_append = " \
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM =
> "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
>
> -# u-boot 2016.07 has support for these
> +# u-boot-xlnx has support for these
> HAS_PLATFORM_INIT ?= " \
> zynq_microzed_config \
> zynq_zed_config \
> zynq_zc702_config \
> zynq_zc706_config \
> zynq_zybo_config \
> - xilinx_zynqmp_zcu102_config \
> + xilinx_zynqmp_zcu102_rev1_0_config \
> "
>
> diff --git a/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
> b/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb
> similarity index 94%
> rename from recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
> rename to recipes-devtools/qemu/qemu-devicetrees_2017.3.bb
> index df9c2c8c7d..d5cfe0b0b1 100644
> --- a/recipes-devtools/qemu/qemu-devicetrees_2017.1.bb
> +++ b/recipes-devtools/qemu/qemu-devicetrees_2017.3.bb
> @@ -7,7 +7,7 @@ inherit deploy
>
> LIC_FILES_CHKSUM =
> "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99"
>
> -SRCREV = "294ffabc02d8a3933f7acfb2256489677776af8d"
> +SRCREV = "4b951c594078562e9dd828430075968dd91ac425"
> SRC_URI =
> "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https;nobranch=1"
>
> S = "${WORKDIR}/git"
> diff --git a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb
> b/recipes-devtools/qemu/qemu-xilinx_2017.3.bb
> similarity index 95%
> rename from recipes-devtools/qemu/qemu-xilinx_2017.1.bb
> rename to recipes-devtools/qemu/qemu-xilinx_2017.3.bb
> index c0d096213e..624715daad 100644
> --- a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb
> +++ b/recipes-devtools/qemu/qemu-xilinx_2017.3.bb
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
>
> file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \
> "
>
> -SRCREV = "45d810957b0f837a5685fbe4bc8d9e3268c1fe64"
> +SRCREV = "8f8c89b18f6e4523099e41d81769fc534064b8de"
> SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https;nobranch=1"
>
> S = "${WORKDIR}/git"
> diff --git a/recipes-kernel/linux/linux-xlnx.inc
> b/recipes-kernel/linux/linux-xlnx.inc
> index 50d6ebf1d3..39c146aa82 100644
> --- a/recipes-kernel/linux/linux-xlnx.inc
> +++ b/recipes-kernel/linux/linux-xlnx.inc
> @@ -7,7 +7,7 @@ PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
> KBRANCH ?= ""
> SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH',
> True) != '']}"
>
> -FILESOVERRIDES_append = ":${LINUX_VERSION}"
> +FILESOVERRIDES_append = ":${XILINX_RELEASE_VERSION}"
> KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https"
> SRC_URI = "${KERNELURI};${SRCBRANCHARG}"
>
> diff --git
> a/recipes-kernel/linux/linux-xlnx/4.9/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
>
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
> similarity index 95%
> rename from
> recipes-kernel/linux/linux-xlnx/4.9/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
> rename to
> recipes-kernel/linux/linux-xlnx/v2017.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
> index 4a9ce4a22c..b8ba70ea23 100644
> ---
> a/recipes-kernel/linux/linux-xlnx/4.9/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
> +++
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
> @@ -1,4 +1,4 @@
> -From 1dd21beeff5ccb2bd1960bf3ef0578aa602b62bf Mon Sep 17 00:00:00 2001
> +From c1bf9e8c50baa237b514715dcb9c8fd367694c93 Mon Sep 17 00:00:00 2001
> From: Jason Wu <jason.wu.m...@gmail.com>
> Date: Sun, 10 Apr 2016 13:14:13 +1000
> Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards
> @@ -49,11 +49,11 @@ index 0000000000..242b24e482
> + dglnt,edid-i2c = <&i2c1>;
> + };
> diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig
> -index a713b17673..c32a4a679e 100644
> +index 12b548c2a9..c3e2562e53 100644
> --- a/drivers/gpu/drm/xilinx/Kconfig
> +++ b/drivers/gpu/drm/xilinx/Kconfig
> -@@ -21,3 +21,9 @@ config DRM_XILINX_DP_SUB
> - select DRM_XILINX_DP
> +@@ -57,3 +57,9 @@ config DRM_XILINX_SDI
> + depends on DRM_XILINX
> help
> DRM driver for Xilinx Display Port Subsystem.
> +
> @@ -63,14 +63,17 @@ index a713b17673..c32a4a679e 100644
> + help
> + DRM slave encoder for Video-out on Digilent boards.
> diff --git a/drivers/gpu/drm/xilinx/Makefile
> b/drivers/gpu/drm/xilinx/Makefile
> -index 705472c338..a571bd96cf 100644
> +index 19bc1541ca..c2717e40ea 100644
> --- a/drivers/gpu/drm/xilinx/Makefile
> +++ b/drivers/gpu/drm/xilinx/Makefile
> -@@ -10,3 +10,4 @@ xilinx_drm-y += xilinx_cresample.o xilinx_osd.o
> xilinx_rgb2yuv.o xilinx_vtc.o
> +@@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o
> xilinx_drm_drv.o \
> + xilinx_drm_plane.o
> + xilinx_drm-y += xilinx_cresample.o xilinx_osd.o xilinx_rgb2yuv.o
> xilinx_vtc.o
> +
> ++obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o
> obj-$(CONFIG_DRM_XILINX) += xilinx_drm.o
> obj-$(CONFIG_DRM_XILINX_DP) += xilinx_drm_dp.o
> obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o
> -+obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o
> diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c
> b/drivers/gpu/drm/xilinx/dglnt_encoder.c
> new file mode 100644
> index 0000000000..26a23986f9
> @@ -295,5 +298,5 @@ index 0000000000..26a23986f9
> +MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards");
> +MODULE_LICENSE("GPL v2");
> --
> -2.11.0
> +2.14.2
>
> diff --git
> a/recipes-kernel/linux/linux-xlnx/4.9/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
>
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
> similarity index 99%
> rename from
> recipes-kernel/linux/linux-xlnx/4.9/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
> rename to
> recipes-kernel/linux/linux-xlnx/v2017.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
> index 9f2c4e87f2..9b6229db02 100644
> ---
> a/recipes-kernel/linux/linux-xlnx/4.9/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
> +++
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
> @@ -1,4 +1,4 @@
> -From 8554dd34a68262849622c1c539b0176d525188f4 Mon Sep 17 00:00:00 2001
> +From 217e3b6f4393926b8dcad841381527ef3fc808c2 Mon Sep 17 00:00:00 2001
> From: Jason Wu <jason.wu.m...@gmail.com>
> Date: Sun, 10 Apr 2016 13:16:06 +1000
> Subject: [PATCH 2/3] clk: Add driver for axi_dynclk IP Core
> @@ -603,5 +603,5 @@ index 0000000000..496ad5fc90
> +MODULE_AUTHOR("Sam Bobrowicz <sbobrow...@digilentinc.com>");
> +MODULE_DESCRIPTION("CCF Driver for Digilent axi_dynclk IP Core");
> --
> -2.11.0
> +2.14.2
>
> diff --git
> a/recipes-kernel/linux/linux-xlnx/4.9/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
>
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
> similarity index 66%
> rename from
> recipes-kernel/linux/linux-xlnx/4.9/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
> rename to
> recipes-kernel/linux/linux-xlnx/v2017.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
> index 8e36a703a7..a98d84c559 100644
> ---
> a/recipes-kernel/linux/linux-xlnx/4.9/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
> +++
> b/recipes-kernel/linux/linux-xlnx/v2017.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
> @@ -1,4 +1,4 @@
> -From 26f5c0d18f54cab4437dfdab0ca4a8a05a27edff Mon Sep 17 00:00:00 2001
> +From 1a18e2b514ae9e75145597ac509a87f656c976ba Mon Sep 17 00:00:00 2001
> From: Nathan Rossi <nat...@nathanrossi.com>
> Date: Mon, 2 May 2016 23:46:42 +1000
> Subject: [PATCH 3/3] drm: xilinx: Fix DPMS transition to on
> @@ -13,14 +13,14 @@ Signed-off-by: Nathan Rossi <nat...@nathanrossi.com>
> Upstream-Status: Pending [This is a workaround]
> ---
> drivers/gpu/drm/xilinx/xilinx_drm_crtc.c | 1 -
> - drivers/gpu/drm/xilinx/xilinx_drm_plane.c | 7 +++----
> - 2 files changed, 3 insertions(+), 5 deletions(-)
> + drivers/gpu/drm/xilinx/xilinx_drm_plane.c | 3 ++-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
> b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
> -index 723bcc47e2..e6777fee05 100644
> +index 631d35b921..93dbd4b58a 100644
> --- a/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
> +++ b/drivers/gpu/drm/xilinx/xilinx_drm_crtc.c
> -@@ -89,7 +89,6 @@ static void xilinx_drm_crtc_dpms(struct drm_crtc
> *base_crtc, int dpms)
> +@@ -88,7 +88,6 @@ static void xilinx_drm_crtc_dpms(struct drm_crtc
> *base_crtc, int dpms)
> default:
> if (crtc->vtc) {
> xilinx_vtc_disable(crtc->vtc);
> @@ -29,21 +29,10 @@ index 723bcc47e2..e6777fee05 100644
> if (crtc->cresample) {
> xilinx_cresample_disable(crtc->cresample);
> diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
> b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
> -index 2646763b17..4211e1bad8 100644
> +index 6a248b72d4..d2518a4bdf 100644
> --- a/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
> +++ b/drivers/gpu/drm/xilinx/xilinx_drm_plane.c
> -@@ -151,9 +151,7 @@ void xilinx_drm_plane_dpms(struct drm_plane *base_plane,
> int dpms)
> - }
> -
> - /* start dma engine */
> -- for (i = 0; i < MAX_NUM_SUB_PLANES; i++)
> -- if (plane->dma[i].chan && plane->dma[i].is_active)
> -- dma_async_issue_pending(plane->dma[i].chan);
> -+ xilinx_drm_plane_commit(base_plane);
> -
> - if (plane->rgb2yuv)
> - xilinx_rgb2yuv_enable(plane->rgb2yuv);
> -@@ -228,7 +226,7 @@ void xilinx_drm_plane_commit(struct drm_plane
> *base_plane)
> +@@ -140,7 +140,7 @@ void xilinx_drm_plane_commit(struct drm_plane
> *base_plane)
> for (i = 0; i < MAX_NUM_SUB_PLANES; i++) {
> struct xilinx_drm_plane_dma *dma = &plane->dma[i];
>
> @@ -52,7 +41,7 @@ index 2646763b17..4211e1bad8 100644
> flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
> desc = dmaengine_prep_interleaved_dma(dma->chan,
> &dma->xt,
> -@@ -241,6 +239,7 @@ void xilinx_drm_plane_commit(struct drm_plane
> *base_plane)
> +@@ -153,6 +153,7 @@ void xilinx_drm_plane_commit(struct drm_plane
> *base_plane)
> dmaengine_submit(desc);
>
> dma_async_issue_pending(dma->chan);
> @@ -61,5 +50,5 @@ index 2646763b17..4211e1bad8 100644
> }
> }
> --
> -2.11.0
> +2.14.2
>
> diff --git a/recipes-kernel/linux/linux-xlnx_2017.1.bb
> b/recipes-kernel/linux/linux-xlnx_2017.3.bb
> similarity index 75%
> rename from recipes-kernel/linux/linux-xlnx_2017.1.bb
> rename to recipes-kernel/linux/linux-xlnx_2017.3.bb
> index 586a635b54..9178f97025 100644
> --- a/recipes-kernel/linux/linux-xlnx_2017.1.bb
> +++ b/recipes-kernel/linux/linux-xlnx_2017.3.bb
> @@ -1,6 +1,6 @@
> LINUX_VERSION = "4.9"
> -XILINX_RELEASE_VERSION = "v2017.1"
> -SRCREV ?= "68e6869cfb8154b80ee9ffafd64932971e9d1d07"
> +XILINX_RELEASE_VERSION = "v2017.3"
> +SRCREV ?= "f1b1e077d641fc83b54c1b8f168cbb58044fbd4e"
>
> include linux-xlnx.inc
>
> --
> 2.14.2
>
>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx
--
_______________________________________________
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
