fix: do not process scratch space when no surface heap pointer provided

Related-To: NEO-8281

Source: 873b3d4

Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -275,7 +275,7 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushImmediateTask(
     flushData.stateComputeModeFullConfigurationNeeded = getStateComputeModeDirty();
     flushData.stateBaseAddressFullConfigurationNeeded = getGSBAStateDirty();
 
-    if (this->requiredScratchSize > 0 || this->requiredPrivateScratchSize > 0) {
+    if (dispatchFlags.sshCpuBase != nullptr && (this->requiredScratchSize > 0 || this->requiredPrivateScratchSize > 0)) {
         bool checkFeStateDirty = false;
         bool checkSbaStateDirty = false;
         scratchSpaceController->setRequiredScratchSpace(dispatchFlags.sshCpuBase,

shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp

@@ -4312,3 +4312,30 @@ HWTEST_F(CommandStreamReceiverHwTest, givenDcFlushRequiredFalseWhenProgramStalli
     ASSERT_NE(nullptr, pipeControl);
     EXPECT_FALSE(pipeControl->getDcFlushEnable());
 }
+
+HWTEST2_F(CommandStreamReceiverHwTest,
+          givenImmediateFlushTaskWhenNextDispatchRequiresScratchSpaceAndSshPointerIsNullThenFrontEndCommandIsNotDispatched,
+          IsAtLeastXeHpCore) {
+    using CFE_STATE = typename FamilyType::CFE_STATE;
+
+    auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
+
+    EXPECT_TRUE(commandStreamReceiver.getMediaVFEStateDirty());
+
+    commandStreamReceiver.flushImmediateTask(commandStream, commandStream.getUsed(), immediateFlushTaskFlags, *pDevice);
+
+    commandStreamReceiver.setRequiredScratchSizes(0x100, 0);
+    immediateFlushTaskFlags.sshCpuBase = nullptr;
+
+    size_t usedSize = commandStreamReceiver.commandStream.getUsed();
+    commandStreamReceiver.flushImmediateTask(commandStream,
+                                             commandStream.getUsed(),
+                                             immediateFlushTaskFlags,
+                                             *pDevice);
+
+    HardwareParse hwParserCsr;
+    hwParserCsr.parseCommands<FamilyType>(commandStreamReceiver.commandStream, usedSize);
+    auto frontEndCmd = hwParserCsr.getCommand<CFE_STATE>();
+    EXPECT_EQ(nullptr, frontEndCmd);
+    EXPECT_FALSE(commandStreamReceiver.getMediaVFEStateDirty());
+}