Merge android13-gs-pixel-5.15 into android14-gs-pixel-5.15

Bug: 260174400
Change-Id: I45d7cf33220e0fce9e4af28081b8fb5f4077d5d3
Signed-off-by: Robin Peng <robinpeng@google.com>

2 files changed, 3 insertions, 0 deletions

diff --git a/bigo.c b/bigo.c
index bab43cd..f7a5b9c 100644
--- a/bigo.c
+++ b/bigo.c
@@ -516,6 +516,8 @@ static irqreturn_t bigo_isr(int irq, void *arg)
 	spin_lock_irqsave(&core->status_lock, flags);
 	core->stat_with_irq = bigo_stat;
 	spin_unlock_irqrestore(&core->status_lock, flags);
+	bigo_stat &= ~BIGO_STAT_MODE;
+	bigo_stat &= ~BIGO_STAT_CODING_MODE;
 	bigo_stat &= ~BIGO_STAT_IRQMASK;
 	bigo_core_writel(core, BIGO_REG_STAT, bigo_stat);
 	complete(&core->frame_done);
diff --git a/bigo_io.h b/bigo_io.h
index 040680e..d291ee9 100644
--- a/bigo_io.h
+++ b/bigo_io.h
@@ -32,6 +32,7 @@
 #define BIGO_STAT_AXI_WR_OVERFLOW BIT(10)
 #define BIGO_STAT_AXI_RD_PENDING BIT(19)
 #define BIGO_STAT_AXI_WR_PENDING BIT(20)
+#define BIGO_STAT_CODING_MODE GENMASK(22, 21)
 #define BIG_STAT_AXI_OVERFLOW_ID GENMASK(30, 23)
 
 #define BIGO_STAT_IRQMASK GENMASK(6, 2)