msm: kgsl: Renaming recovery to fault tolerance
Renaming recovery to fault tolerance and modifying
the functions and log messages accordingly.
Change-Id: I5f249806026ac514c4aff7da45c3a4e8cc2f8c34
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno.h b/drivers/gpu/msm/adreno.h
index 03c82bf..23fce2f 100644
--- a/drivers/gpu/msm/adreno.h
+++ b/drivers/gpu/msm/adreno.h
@@ -134,8 +134,8 @@
};
/*
- * struct adreno_recovery_data - Structure that contains all information to
- * perform gpu recovery from hangs
+ * struct adreno_ft_data - Structure that contains all information to
+ * perform gpu fault tolerance
* @ib1 - IB1 that the GPU was executing when hang happened
* @context_id - Context which caused the hang
* @global_eop - eoptimestamp at time of hang
@@ -147,15 +147,15 @@
* good_rb_size - Number of valid dwords in good_rb_buffer
* @last_valid_ctx_id - The last context from which commands were placed in
* ringbuffer before the GPU hung
- * @step - Current recovery step being executed
- * @err_code - Recovery error code
+ * @step - Current fault tolerance step being executed
+ * @err_code - Fault tolerance error code
* @fault - Indicates whether the hang was caused due to a pagefault
* @start_of_replay_cmds - Offset in ringbuffer from where commands can be
- * replayed during recovery
+ * replayed during fault tolerance
* @replay_for_snapshot - Offset in ringbuffer where IB's can be saved for
* replaying with snapshot
*/
-struct adreno_recovery_data {
+struct adreno_ft_data {
unsigned int ib1;
unsigned int context_id;
unsigned int global_eop;
@@ -167,7 +167,6 @@
unsigned int good_rb_size;
unsigned int last_valid_ctx_id;
unsigned int step;
- unsigned int err_code;
int fault;
unsigned int start_of_replay_cmds;
unsigned int replay_for_snapshot;
@@ -175,13 +174,12 @@
enum ft_steps {
FT_REPLAY_BAD_CTXT_CMDS = 0,
- FT_NOT_IB_BAD_CTXT_CMDS,
+ FT_NOP_IB_BAD_CTXT_CMDS,
FT_SKIP_EOF_BAD_CTXT_CMDS,
FT_FAIL_BAD_CTXT_CMDS,
FT_PLAY_GOOD_CTXT_CMDS
};
-
extern struct adreno_gpudev adreno_a2xx_gpudev;
extern struct adreno_gpudev adreno_a3xx_gpudev;
@@ -229,7 +227,10 @@
void *adreno_snapshot(struct kgsl_device *device, void *snapshot, int *remain,
int hang);
-int adreno_dump_and_recover(struct kgsl_device *device);
+int adreno_dump_and_exec_ft(struct kgsl_device *device);
+
+void adreno_dump_rb(struct kgsl_device *device, const void *buf,
+ size_t len, int start, int size);
unsigned int adreno_hang_detect(struct kgsl_device *device,
unsigned int *prev_reg_val);