Revert "[VP] New state_heap hwcmds and interface"
Revert "[VP] New state_heap hwcmds and interface"
This reverts commit 7ddfcb70.
Change-Id: I9183b2948388be716219e70bd7e927f8e3746b43
diff --git a/media_driver/agnostic/common/hw/mhw_state_heap_generic.h b/media_driver/agnostic/common/hw/mhw_state_heap_generic.h
index 8ad9514..d126bc5 100644
--- a/media_driver/agnostic/common/hw/mhw_state_heap_generic.h
+++ b/media_driver/agnostic/common/hw/mhw_state_heap_generic.h
@@ -125,7 +125,7 @@
typename TCmds::BINDING_TABLE_STATE_CMD *pBtDst =
(typename TCmds::BINDING_TABLE_STATE_CMD *)pParams->pBindingTableTarget;
MHW_MI_CHK_NULL(pBtDst);
-
+
uint32_t CmdByteSize = TCmds::BINDING_TABLE_STATE_CMD::byteSize;
// Setup and increment BT pointers
@@ -159,6 +159,42 @@
MHW_FUNCTION_ENTER;
+ MHW_MI_CHK_NULL(pParams);
+
+ for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
+ {
+ PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
+ MHW_MI_CHK_NULL(pKernelState);
+
+ typename TCmds::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
+
+ cmd.DW0.KernelStartPointer =
+ (pKernelState->m_ishRegion.GetOffset() +
+ pKernelState->dwKernelBinaryOffset +
+ pParams[dwCurrId].dwKernelStartOffset) >> MHW_KERNEL_OFFSET_SHIFT;
+ cmd.DW3.SamplerStatePointer =
+ (pKernelState->m_dshRegion.GetOffset() +
+ pKernelState->dwSamplerOffset +
+ pParams[dwCurrId].dwSamplerOffset) >> MHW_SAMPLER_SHIFT;
+ cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
+ cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
+ (pKernelState->dwSshOffset +
+ pParams[dwCurrId].dwBtOffset),
+ MHW_BINDING_TABLE_ID_SHIFT);
+ cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
+ pParams->pKernelState->KernelParams.iCurbeLength,
+ MHW_CURBE_SHIFT);
+ cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
+
+ uint32_t idOffsetInIdSpace =
+ pKernelState->dwIdOffset +
+ (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
+ MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
+ &cmd,
+ idOffsetInIdSpace,
+ cmd.byteSize));
+ }
+
return eStatus;
}
};
diff --git a/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.c b/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.c
index 7964e14..87e246e 100644
--- a/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.c
+++ b/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.c
@@ -1121,50 +1121,3 @@
return eStatus;
}
-MOS_STATUS MHW_STATE_HEAP_INTERFACE_G10_X::SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams)
-{
- MOS_STATUS eStatus = MOS_STATUS_SUCCESS;
-
- MHW_FUNCTION_ENTER;
- MHW_MI_CHK_NULL(pParams);
-
- for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
- {
- PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
-
- MHW_MI_CHK_NULL(pKernelState);
-
- mhw_state_heap_g10_X::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
-
- cmd.DW0.KernelStartPointer =
- (pKernelState->m_ishRegion.GetOffset() +
- pKernelState->dwKernelBinaryOffset +
- pParams[dwCurrId].dwKernelStartOffset) >>
- MHW_KERNEL_OFFSET_SHIFT;
- cmd.DW3.SamplerStatePointer =
- (pKernelState->m_dshRegion.GetOffset() +
- pKernelState->dwSamplerOffset +
- pParams[dwCurrId].dwSamplerOffset) >>
- MHW_SAMPLER_SHIFT;
- cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
- cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
- (pKernelState->dwSshOffset +
- pParams[dwCurrId].dwBtOffset),
- MHW_BINDING_TABLE_ID_SHIFT);
- cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
- pParams->pKernelState->KernelParams.iCurbeLength,
- MHW_CURBE_SHIFT);
- cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
-
- uint32_t idOffsetInIdSpace =
- pKernelState->dwIdOffset +
- (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
- MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
- &cmd,
- idOffsetInIdSpace,
- cmd.byteSize));
- }
- return eStatus;
-}
diff --git a/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.h b/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.h
index 482478c..3930d81 100644
--- a/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.h
+++ b/media_driver/agnostic/gen10/hw/mhw_state_heap_g10.h
@@ -77,10 +77,6 @@
MOS_STATUS InitHwSizes();
- MOS_STATUS SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams);
-
};
#endif
diff --git a/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.c b/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.c
index 5c034d5..cf81c46 100644
--- a/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.c
+++ b/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.c
@@ -1103,51 +1103,3 @@
return eStatus;
}
-
-MOS_STATUS MHW_STATE_HEAP_INTERFACE_G11_X::SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams)
-{
- MOS_STATUS eStatus = MOS_STATUS_SUCCESS;
-
- MHW_FUNCTION_ENTER;
-
- MHW_MI_CHK_NULL(pParams);
- for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
- {
- PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
-
- MHW_MI_CHK_NULL(pKernelState);
-
- mhw_state_heap_g11_X::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
-
- cmd.DW0.KernelStartPointer =
- (pKernelState->m_ishRegion.GetOffset() +
- pKernelState->dwKernelBinaryOffset +
- pParams[dwCurrId].dwKernelStartOffset) >>
- MHW_KERNEL_OFFSET_SHIFT;
- cmd.DW3.SamplerStatePointer =
- (pKernelState->m_dshRegion.GetOffset() +
- pKernelState->dwSamplerOffset +
- pParams[dwCurrId].dwSamplerOffset) >>
- MHW_SAMPLER_SHIFT;
- cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
- cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
- (pKernelState->dwSshOffset +
- pParams[dwCurrId].dwBtOffset),
- MHW_BINDING_TABLE_ID_SHIFT);
- cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
- pParams->pKernelState->KernelParams.iCurbeLength,
- MHW_CURBE_SHIFT);
- cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
-
- uint32_t idOffsetInIdSpace =
- pKernelState->dwIdOffset +
- (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
- MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
- &cmd,
- idOffsetInIdSpace,
- cmd.byteSize));
- }
- return eStatus;
-}
diff --git a/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.h b/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.h
index b55923c..f591a15 100644
--- a/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.h
+++ b/media_driver/agnostic/gen11/hw/mhw_state_heap_g11.h
@@ -74,12 +74,8 @@
MOS_STATUS LoadSamplerAvsTable(
void *pTable,
PMHW_SAMPLER_AVS_TABLE_PARAM pMhwSamplerAvsTableParam);
-
+
MOS_STATUS InitHwSizes();
- MOS_STATUS SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams);
-
};
#endif
diff --git a/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.c b/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.c
index faf42fc..80271c7 100644
--- a/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.c
+++ b/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.c
@@ -968,51 +968,3 @@
return eStatus;
}
-
-MOS_STATUS MHW_STATE_HEAP_INTERFACE_G12_X::SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams)
-{
- MOS_STATUS eStatus = MOS_STATUS_SUCCESS;
-
- MHW_FUNCTION_ENTER;
- MHW_MI_CHK_NULL(pParams);
-
- for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
- {
- PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
-
- MHW_MI_CHK_NULL(pKernelState);
-
- mhw_state_heap_g12_X::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
-
- cmd.DW0.KernelStartPointer =
- (pKernelState->m_ishRegion.GetOffset() +
- pKernelState->dwKernelBinaryOffset +
- pParams[dwCurrId].dwKernelStartOffset) >>
- MHW_KERNEL_OFFSET_SHIFT;
- cmd.DW3.SamplerStatePointer =
- (pKernelState->m_dshRegion.GetOffset() +
- pKernelState->dwSamplerOffset +
- pParams[dwCurrId].dwSamplerOffset) >>
- MHW_SAMPLER_SHIFT;
- cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
- cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
- (pKernelState->dwSshOffset +
- pParams[dwCurrId].dwBtOffset),
- MHW_BINDING_TABLE_ID_SHIFT);
- cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
- pParams->pKernelState->KernelParams.iCurbeLength,
- MHW_CURBE_SHIFT);
- cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
-
- uint32_t idOffsetInIdSpace =
- pKernelState->dwIdOffset +
- (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
- MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
- &cmd,
- idOffsetInIdSpace,
- cmd.byteSize));
- }
- return eStatus;
-}
diff --git a/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.h b/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.h
index 07a07cf..ce3f282 100644
--- a/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.h
+++ b/media_driver/agnostic/gen12/hw/mhw_state_heap_g12.h
@@ -79,9 +79,5 @@
MOS_STATUS InitHwSizes();
- MOS_STATUS SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams);
-
};
#endif
diff --git a/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.c b/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.c
index 1f0ac11..c1077d8 100644
--- a/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.c
+++ b/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.c
@@ -899,51 +899,3 @@
return eStatus;
}
-
-MOS_STATUS MHW_STATE_HEAP_INTERFACE_G8_X::SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams)
-{
- MOS_STATUS eStatus = MOS_STATUS_SUCCESS;
-
- MHW_FUNCTION_ENTER;
- MHW_MI_CHK_NULL(pParams);
-
- for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
- {
- PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
-
- MHW_MI_CHK_NULL(pKernelState);
-
- mhw_state_heap_g8_X::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
-
- cmd.DW0.KernelStartPointer =
- (pKernelState->m_ishRegion.GetOffset() +
- pKernelState->dwKernelBinaryOffset +
- pParams[dwCurrId].dwKernelStartOffset) >>
- MHW_KERNEL_OFFSET_SHIFT;
- cmd.DW3.SamplerStatePointer =
- (pKernelState->m_dshRegion.GetOffset() +
- pKernelState->dwSamplerOffset +
- pParams[dwCurrId].dwSamplerOffset) >>
- MHW_SAMPLER_SHIFT;
- cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
- cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
- (pKernelState->dwSshOffset +
- pParams[dwCurrId].dwBtOffset),
- MHW_BINDING_TABLE_ID_SHIFT);
- cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
- pParams->pKernelState->KernelParams.iCurbeLength,
- MHW_CURBE_SHIFT);
- cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
-
- uint32_t idOffsetInIdSpace =
- pKernelState->dwIdOffset +
- (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
- MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
- &cmd,
- idOffsetInIdSpace,
- cmd.byteSize));
- }
- return eStatus;
-}
diff --git a/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.h b/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.h
index d2f7a66..2ddebe5 100644
--- a/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.h
+++ b/media_driver/agnostic/gen8/hw/mhw_state_heap_g8.h
@@ -80,10 +80,6 @@
MOS_STATUS InitHwSizes();
- MOS_STATUS SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams);
-
};
#endif
diff --git a/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.c b/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.c
index f37b59c..d80a1f2 100644
--- a/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.c
+++ b/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.c
@@ -1105,51 +1105,3 @@
return eStatus;
}
-
-MOS_STATUS MHW_STATE_HEAP_INTERFACE_G9_X::SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams)
-{
- MOS_STATUS eStatus = MOS_STATUS_SUCCESS;
-
- MHW_FUNCTION_ENTER;
- MHW_MI_CHK_NULL(pParams);
-
- for (uint32_t dwCurrId = 0; dwCurrId < dwNumIdsToSet; dwCurrId++)
- {
- PMHW_KERNEL_STATE pKernelState = pParams[dwCurrId].pKernelState;
-
- MHW_MI_CHK_NULL(pKernelState);
-
- mhw_state_heap_g9_X::INTERFACE_DESCRIPTOR_DATA_CMD cmd;
-
- cmd.DW0.KernelStartPointer =
- (pKernelState->m_ishRegion.GetOffset() +
- pKernelState->dwKernelBinaryOffset +
- pParams[dwCurrId].dwKernelStartOffset) >>
- MHW_KERNEL_OFFSET_SHIFT;
- cmd.DW3.SamplerStatePointer =
- (pKernelState->m_dshRegion.GetOffset() +
- pKernelState->dwSamplerOffset +
- pParams[dwCurrId].dwSamplerOffset) >>
- MHW_SAMPLER_SHIFT;
- cmd.DW3.SamplerCount = (pKernelState->KernelParams.iSamplerCount - 1) / 4 + 1;
- cmd.DW4.BindingTablePointer = MOS_ROUNDUP_SHIFT(
- (pKernelState->dwSshOffset +
- pParams[dwCurrId].dwBtOffset),
- MHW_BINDING_TABLE_ID_SHIFT);
- cmd.DW5.ConstantIndirectUrbEntryReadLength = MOS_ROUNDUP_SHIFT(
- pParams->pKernelState->KernelParams.iCurbeLength,
- MHW_CURBE_SHIFT);
- cmd.DW6.NumberOfThreadsInGpgpuThreadGroup = 1;
-
- uint32_t idOffsetInIdSpace =
- pKernelState->dwIdOffset +
- (pParams[dwCurrId].dwIdIdx * m_wSizeOfCmdInterfaceDescriptorData);
- MHW_MI_CHK_STATUS(pKernelState->m_dshRegion.AddData(
- &cmd,
- idOffsetInIdSpace,
- cmd.byteSize));
- }
- return eStatus;
-}
diff --git a/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.h b/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.h
index 34c6e02..d15e84b 100644
--- a/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.h
+++ b/media_driver/agnostic/gen9/hw/mhw_state_heap_g9.h
@@ -77,10 +77,6 @@
MOS_STATUS InitHwSizes();
- MOS_STATUS SetInterfaceDescriptor(
- uint32_t dwNumIdsToSet,
- PMHW_INTERFACE_DESCRIPTOR_PARAMS pParams);
-
};
#endif
