commit 0ac270e0f42ea5340f89b8690fa6877cdc39c333
author Xu, Zhengguo <zhengguo.xu@intel.com> Fri May 27 15:26:46 2022 +0000
committer John Bauman <jbauman@google.com> Fri May 27 15:26:46 2022 +0000
tree 647b593bcf2aaa12c5acd84ec76217be6aad1b11
parent 7add90c05bd91df536716ac3f0482d6c8ca26f02

[Decode] Correct the status report reigster for vp9

Fixes #1416

(cherry picked from commit 3e13ecaf895c24a2a1775c637e2a0380be373763)

Bug: 100927
Change-Id: Ie10229e4a8febedb7115d8701740c729546ed003
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/github.com/intel/media-driver/+/684310
Reviewed-by: Stefan Bossbaly <stefanbossbaly@google.com>

media_driver/agnostic/common/codec/hal/codechal_decoder.cpp

diff --git a/media_driver/agnostic/common/codec/hal/codechal_decoder.cpp b/media_driver/agnostic/common/codec/hal/codechal_decoder.cpp
index ab9416d..4c697ad 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_decoder.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_decoder.cpp
@@ -1460,7 +1460,7 @@
     MHW_MI_STORE_REGISTER_MEM_PARAMS regParams;
     regParams.presStoreBuffer   = &m_decodeStatusBuf.m_statusBuffer;
     regParams.dwOffset          = errStatusOffset;
-    regParams.dwRegister        = (m_standard == CODECHAL_HEVC && mmioRegistersHcp) ?
+    regParams.dwRegister        = ((m_standard == CODECHAL_HEVC || m_standard == CODECHAL_VP9) && mmioRegistersHcp) ?
         mmioRegistersHcp->hcpCabacStatusRegOffset : mmioRegistersMfx->mfxErrorFlagsRegOffset;
     CODECHAL_DECODE_CHK_STATUS_RETURN(m_miInterface->AddMiStoreRegisterMemCmd(
         cmdBuffer,
@@ -1498,7 +1498,7 @@
 
     regParams.presStoreBuffer   = &m_decodeStatusBuf.m_statusBuffer;
     regParams.dwOffset          = mbCountOffset;
-    regParams.dwRegister        = (m_standard == CODECHAL_HEVC && mmioRegistersHcp) ?
+    regParams.dwRegister        = ((m_standard == CODECHAL_HEVC || m_standard == CODECHAL_VP9) && mmioRegistersHcp) ?
         mmioRegistersHcp->hcpDecStatusRegOffset : mmioRegistersMfx->mfxMBCountRegOffset;
     CODECHAL_DECODE_CHK_STATUS_RETURN(m_miInterface->AddMiStoreRegisterMemCmd(
         cmdBuffer,
@@ -1684,7 +1684,7 @@
                     // No problem in execution
                     codecStatus[j].m_codecStatus = CODECHAL_STATUS_SUCCESSFUL;
 
-                    if (m_standard == CODECHAL_HEVC)
+                    if (m_standard == CODECHAL_HEVC || m_standard == CODECHAL_VP9)
                     {
                         if ((m_decodeStatusBuf.m_decodeStatus[i].m_mmioErrorStatusReg &
                              m_hcpInterface->GetHcpCabacErrorFlagsMask()) != 0)