From 870d99e1c6f4934707ce71a4cc1eec092cde7810 Mon Sep 17 00:00:00 2001 From: Luc Verhaegen Date: Fri, 11 Mar 2011 15:02:55 +0100 Subject: [PATCH] gpu: pvr: pdumpfs: fix for imgtec simulator When full dumping is enabled through init, the simulator throws in the towel on the dumped CCB wait at the end of initialisation. Signed-off-by: Luc Verhaegen Signed-off-by: Imre Deak --- pvr/pvr_pdumpfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pvr/pvr_pdumpfs.c b/pvr/pvr_pdumpfs.c index 23e54da..6050fd3 100644 --- a/pvr/pvr_pdumpfs.c +++ b/pvr/pvr_pdumpfs.c @@ -215,7 +215,8 @@ pdumpfs_capture_enabled(void) mutex_lock(pdumpfs_mutex); - if (pdumpfs_mode == PDUMPFS_MODE_FULL) + if ((pdumpfs_mode == PDUMPFS_MODE_FULL) && + (frame_current != frame_init)) /* simulator bails otherwise */ ret = true; else ret = false; @@ -235,10 +236,12 @@ pdumpfs_flags_check(u32 flags) mutex_lock(pdumpfs_mutex); - if (pdumpfs_mode == PDUMPFS_MODE_FULL) + if (pdumpfs_mode == PDUMPFS_MODE_DISABLED) + ret = false; + else if ((pdumpfs_mode == PDUMPFS_MODE_FULL) && + (frame_current != frame_init)) /* simulator bails otherwise */ ret = true; - else if ((pdumpfs_mode == PDUMPFS_MODE_STANDARD) && - (flags & PDUMP_FLAGS_CONTINUOUS)) + else if (flags & PDUMP_FLAGS_CONTINUOUS) ret = true; else ret = false; -- 2.39.2