diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.11.p2.6.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb
similarity index 77%
rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.11.p2.6.bb
rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb
index 2d4875bca..8bdcf8078 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.11.p2.6.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 NXP
+# Copyright 2017-2024 NXP
 
 DESCRIPTION = "Sample program to monitor i.MX GPU performance data"
 LICENSE = "MIT"
@@ -9,12 +9,18 @@ DEPENDS = "libgpuperfcnt"
 GPUTOP_SRC ?= "git://github.com/nxp-imx/imx-gputop.git;protocol=https"
 SRCBRANCH = "release"
 SRC_URI = "${GPUTOP_SRC};branch=${SRCBRANCH} "
-SRCREV = "9bd1c4213daf2b32509bf86e7443ab3060d251c4"
+SRCREV = "627e8823e1ba17c6d12b408835029a1c065bea84"
 
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
+PACKAGECONFIG ??= "vivante"
+PACKAGECONFIG:mx95-nxp-bsp = "mali"
+
+PACKAGECONFIG[mali] = "-DMALI_GPU=1,,,,,vivante"
+PACKAGECONFIG[vivante] = ",,,,,mali"
+
 do_compile:append () {
     oe_runmake -C ${S} man
 }
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.6.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.6.bb
deleted file mode 100644
index 8b9f80cc1..000000000
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.6.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "A library to retrieve i.MX GPU performance data"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-
-IMX_SRCREV_ABBREV = "99ab423"
-
-SRC_URI[arm-fb.md5sum] = "4824fe0fadf237c6fd7c4f906517bf74"
-SRC_URI[arm-fb.sha256sum] = "3a6ad76ed39a066a14520da567aeb177e85d8ca48bfe2a4f9568ac8858b0ef1f"
-
-SRC_URI[arm-wayland.md5sum] = "263a673c9fe10ffb1f82342c8310335d"
-SRC_URI[arm-wayland.sha256sum] = "856ae708132db2a3dc189244f87d3cc36565ee0392e3fcce9c9c9deb7b74b090"
-
-SRC_URI[arm-x11.md5sum] = "62788042779d29e9f69931f607c79826"
-SRC_URI[arm-x11.sha256sum] = "35fb8d4fb54e0a64d783ee0d602c42b5bc1511f0c8dd4a0946a287cf6247f80b"
-
-SRC_URI[aarch64-fb.md5sum] = "87163a5e983e9016c5c4811ecfc190fb"
-SRC_URI[aarch64-fb.sha256sum] = "9ef818398077493551185925974fced3b81aff5bf15e77942a232557229c881e"
-
-SRC_URI[aarch64-wayland.md5sum] = "b38a416670258fc2bc21bcb90120833d"
-SRC_URI[aarch64-wayland.sha256sum] = "a2f173b5217a653a7e3407782572bf9b14cb90ffe32a101e18cf89d884a36a7b"
-
-SRC_URI[aarch64-x11.md5sum] = "bb862e55b8ee79ee5a83b0119618cd07"
-SRC_URI[aarch64-x11.sha256sum] = "85c1b51d33e5939600af311d509191387b864db2e0b55e11347b93831e662228"
-
-inherit fsl-eula-unpack2 fsl-eula-graphics fsl-eula-recent
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-
-RDEPENDS:${PN} = "imx-gpu-viv"
-
-# Compatible only with i.MX with GPU
-COMPATIBLE_MACHINE        = "(^$)"
-COMPATIBLE_MACHINE:imxgpu = "${MACHINE}"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb
new file mode 100644
index 000000000..98c8cf861
--- /dev/null
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A library to retrieve i.MX GPU performance data"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
+
+IMX_SRCREV_ABBREV = "99ab423"
+
+SRC_URI[arm-fb.sha256sum] = "be907da4aa533e1c325002dee93364965553a1f971442b1c3661bc8a3c9b6212"
+SRC_URI[arm-wayland.sha256sum] = "07334d80e692b6c228437d037ec97ca5d59af9f9b3ddf12a8503defc9bd7e1be"
+SRC_URI[aarch64-wayland.sha256sum] = "1f24a74fae88814eae2d3ca35addddace7889438500105a137265c961d1bacdd"
+SRC_URI[aarch64-wayland-mali.sha256sum] = "a0dff721ac7ff6a89862f85bf5a49f60df571dbab8676babbf702feb8e4d5da5"
+
+inherit fsl-eula-unpack2 fsl-eula-graphics fsl-eula-recent
+
+PACKAGECONFIG ??= "vivante"
+PACKAGECONFIG:mx95-nxp-bsp = "mali"
+
+PACKAGECONFIG[mali] = ",,,mali-imx,,vivante"
+PACKAGECONFIG[vivante] = ",,,imx-gpu-viv,,mali"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+# Compatible only with i.MX with GPU
+COMPATIBLE_MACHINE        = "(^$)"
+COMPATIBLE_MACHINE:imxgpu = "${MACHINE}"