From fda6904060d64bb94055a1ec702cc7dac38388c8 Mon Sep 17 00:00:00 2001
From: Simon Perretta <simon.perretta@imgtec.com>
Date: Wed, 8 Mar 2023 14:18:35 +0000
Subject: [PATCH] pvr: Add missing feature check in compute cmd stream

Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31679>
---
 .../vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c
index 8add2517e40..a14daaad78d 100644
--- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c
+++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_job_compute.c
@@ -163,8 +163,10 @@ pvr_srv_compute_cmd_stream_load(struct rogue_fwif_cmd_compute *const cmd,
    regs->cdm_resume_pds1 = *stream_ptr;
    stream_ptr += pvr_cmd_length(CR_CDM_CONTEXT_PDS1);
 
-   regs->cdm_item = *stream_ptr;
-   stream_ptr += pvr_cmd_length(CR_CDM_ITEM);
+   if (PVR_HAS_FEATURE(dev_info, compute_morton_capable)) {
+      regs->cdm_item = *stream_ptr;
+      stream_ptr += pvr_cmd_length(CR_CDM_ITEM);
+   }
 
    if (PVR_HAS_FEATURE(dev_info, cluster_grouping)) {
       regs->compute_cluster = *stream_ptr;