AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1185351 by rili@rili_opencl_stg on 2015/08/27 16:33:46

Browse Source 
EPR #425788 - Remove uvd/vce related code from GSL&UGL

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#137 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#55 edit
This commit is contained in:
foreman
2015-08-27 16:48:46 -04:00
parent 4a2cfbda56
commit 55b7281cc5
5 changed files with 7 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp
+7 -41
View File
@@ -62,8 +62,6 @@ CALGSLContext::open(
gslEngineID mainEngineOrdinal = GSL_ENGINEID_INVALID;
gslEngineID sdmaOrdinal = GSL_ENGINEID_INVALID;
gslEngineID decoderOrdinal = GSL_ENGINEID_INVALID;
gslEngineID encoderOrdinal = GSL_ENGINEID_INVALID;
for (uint i = 0; i < nEngines; i++)
{
if (engines[i].id >= GSL_ENGINEID_3DCOMPUTE0 &&
@@ -78,30 +76,9 @@ CALGSLContext::open(
sdmaOrdinal = engines[i].id;
m_allowDMA = dev()->canDMA();
}
if (engines[i].id == GSL_ENGINEID_UVD)
{
decoderOrdinal = engines[i].id;
}
if (engines[i].id == GSL_ENGINEID_VCE)
{
encoderOrdinal = engines[i].id;
}
}
if (decoderOrdinal != GSL_ENGINEID_INVALID)
{
m_cs = native->createDecoderContext(decoderOrdinal);
}
else if (encoderOrdinal != GSL_ENGINEID_INVALID)
{
m_cs = native->createEncoderContext(encoderOrdinal);
}
else
{
m_cs = native->createComputeContext(mainEngineOrdinal, sdmaOrdinal, false);
}
m_cs = native->createComputeContext(mainEngineOrdinal, sdmaOrdinal, false);
if (m_cs == 0)
{
@@ -139,27 +116,16 @@ CALGSLContext::open(
//
m_rs->setComputeShader(m_cs, true);
if (decoderOrdinal != GSL_ENGINEID_INVALID)
m_eventQueue[MainEngine].open(m_cs, GSL_SYNC_ATI, EQConfig);
if (dev()->uavInCB())
{
m_eventQueue[MainEngine].open(m_cs, GSL_UVD_SYNC_ATI, EQConfig, GSL_ENGINEMASK_ALL_BUT_UVD_VCE | GSL_ENGINE_MASK(GSL_ENGINEID_UVD));
}
else if (encoderOrdinal != GSL_ENGINEID_INVALID)
{
m_eventQueue[MainEngine].open(m_cs, GSL_VCE_SYNC_ATI, EQConfig, GSL_ENGINEMASK_ALL_BUT_UVD_VCE | GSL_ENGINE_MASK(GSL_ENGINEID_VCE));
// Evergreen uses physical mode for DRM engine, so flush 3D pipe wih DRM,
// thus GSL can get VA ranges back from KMD asap
m_eventQueue[SdmaEngine].open(m_cs, GSL_DRMDMA_SYNC_ATI, EQConfig);
}
else
{
m_eventQueue[MainEngine].open(m_cs, GSL_SYNC_ATI, EQConfig);
if (dev()->uavInCB())
{
// Evergreen uses physical mode for DRM engine, so flush 3D pipe wih DRM,
// thus GSL can get VA ranges back from KMD asap
m_eventQueue[SdmaEngine].open(m_cs, GSL_DRMDMA_SYNC_ATI, EQConfig);
}
else
{
m_eventQueue[SdmaEngine].open(m_cs, GSL_DRMDMA_SYNC_ATI, EQConfig, GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA0) | GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA1));
}
m_eventQueue[SdmaEngine].open(m_cs, GSL_DRMDMA_SYNC_ATI, EQConfig, GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA0) | GSL_ENGINE_MASK(GSL_ENGINEID_DRMDMA1));
}
m_cs->setGPU((gslGPUMask)dev()->getVPUMask());