AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_instr_defs.h
..
..
@@ -1,7 +1,7 @@
1
1
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2
2
 /*
3
3
  *
4
- * (C) COPYRIGHT 2014, 2016, 2018-2021 ARM Limited. All rights reserved.
4
+ * (C) COPYRIGHT 2014, 2016, 2018-2022 ARM Limited. All rights reserved.
5
5
  *
6
6
  * This program is free software and is provided to you under the terms of the
7
7
  * GNU General Public License version 2 as published by the Free Software
..
..
@@ -26,7 +26,7 @@
26
26
 #ifndef _KBASE_INSTR_DEFS_H_
27
27
 #define _KBASE_INSTR_DEFS_H_
28
28
 
29
-#include <mali_kbase_hwcnt_gpu.h>
29
+#include <hwcnt/mali_kbase_hwcnt_gpu.h>
30
30
 
31
31
 /*
32
32
  * Instrumentation State Machine States
..
..
@@ -38,8 +38,12 @@
38
38
 	KBASE_INSTR_STATE_IDLE,
39
39
 	/* Hardware is currently dumping a frame. */
40
40
 	KBASE_INSTR_STATE_DUMPING,
41
-	/* An error has occured during DUMPING (page fault). */
42
-	KBASE_INSTR_STATE_FAULT
41
+	/* An error has occurred during DUMPING (page fault). */
42
+	KBASE_INSTR_STATE_FAULT,
43
+	/* An unrecoverable error has occurred, a reset is the only way to exit
44
+	 * from unrecoverable error state.
45
+	 */
46
+	KBASE_INSTR_STATE_UNRECOVERABLE_ERROR,
43
47
 };
44
48
 
45
49
 /* Structure used for instrumentation and HW counters dumping */