diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index c4481de5101..75ee394bedc 100644
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -655,21 +655,6 @@ struct mali_job_descriptor_header {
u64 next_job;
} __attribute__((packed));
-/* These concern exception_status */
-
-/* Access type causing a fault, paralleling AS_FAULTSTATUS_* entries in the
- * kernel */
-
-enum mali_exception_access {
- /* Atomic in the kernel for MMU, but that doesn't make sense for a job
- * fault so it's just unused */
- MALI_EXCEPTION_ACCESS_NONE = 0,
-
- MALI_EXCEPTION_ACCESS_EXECUTE = 1,
- MALI_EXCEPTION_ACCESS_READ = 2,
- MALI_EXCEPTION_ACCESS_WRITE = 3
-};
-
/* Details about write_value from panfrost igt tests which use it as a generic
* dword write primitive */
diff --git a/src/panfrost/lib/decode.c b/src/panfrost/lib/decode.c
index 6538b47f8a3..d103829fe5c 100644
--- a/src/panfrost/lib/decode.c
+++ b/src/panfrost/lib/decode.c
@@ -494,21 +494,6 @@ pandecode_special_record(uint64_t v, bool* attribute)
}
}
-#define DEFINE_CASE(name) case MALI_EXCEPTION_ACCESS_## name: return ""#name
-static char *
-pandecode_exception_access(unsigned access)
-{
- switch (access) {
- DEFINE_CASE(NONE);
- DEFINE_CASE(EXECUTE);
- DEFINE_CASE(READ);
- DEFINE_CASE(WRITE);
-
- default:
- unreachable("Invalid case");
- }
-}
-#undef DEFINE_CASE
/* Midgard's tiler descriptor is embedded within the
* larger FBD */
@@ -2862,7 +2847,7 @@ pandecode_jc(mali_ptr jc_gpu_va, bool bifrost, unsigned gpu_id, bool minimal)
pandecode_prop("exception_status = %x (source ID: 0x%x access: %s exception: 0x%x)",
h->exception_status,
(h->exception_status >> 16) & 0xFFFF,
- pandecode_exception_access((h->exception_status >> 8) & 0x3),
+ mali_exception_access_as_str((h->exception_status >> 8) & 0x3),
h->exception_status & 0xFF);
if (h->first_incomplete_task)
diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml
index 37aa98987de..97199b5a032 100644
--- a/src/panfrost/lib/midgard.xml
+++ b/src/panfrost/lib/midgard.xml
@@ -27,6 +27,13 @@
+
+
+
+
+
+
+