Skip to content

Commit d5dd47b

Browse files
committed
[Decode] Reenable VC1 decode for DG2
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
1 parent 026370f commit d5dd47b

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

media_driver/linux/Xe_M/ddi/media_sku_wa_xe.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static struct LinuxCodecInfo Dg2CodecInfo =
8080
.avcDecoding = 1,
8181
.mpeg2Decoding = 1,
8282
.vp8Decoding = 0,
83-
.vc1Decoding = 0,
83+
.vc1Decoding = SET_STATUS_BY_FULL_OPEN_SOURCE(1, 0),
8484
.jpegDecoding = 1,
8585
.avcEncoding = 0,
8686
.mpeg2Encoding = 0,

media_driver/media_interface/media_interfaces_dg2/media_interfaces_dg2.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ static bool dg2RegisteredMhw =
187187
#define PLATFORM_INTEL_DG2 22
188188
#define GENX_XEHP 11
189189
#define GENX_DG2 13
190+
#define GENX_TGLLP 12
190191

191192
MOS_STATUS MhwInterfacesDg2::Initialize(
192193
CreateParams params,
@@ -916,7 +917,6 @@ MOS_STATUS CodechalInterfacesNextXe_Hpm::Initialize(
916917
return MOS_STATUS_SUCCESS;
917918
}
918919

919-
#ifdef _MEDIA_RESERVED
920920
static bool dg2RegisteredCMHal =
921921
MediaFactory<uint32_t, CMHalDevice>::
922922
Register<CMHalInterfacesXe_Hpm>((uint32_t)IGFX_DG2);
@@ -933,12 +933,18 @@ MOS_STATUS CMHalInterfacesXe_Hpm::Initialize(CM_HAL_STATE *pCmState)
933933
MHW_ASSERTMESSAGE("Create CM Hal interfaces failed.")
934934
return MOS_STATUS_NO_SPACE;
935935
}
936+
#ifdef _MEDIA_RESERVED
936937
device->SetCopyKernelIsa((void*)pGPUCopy_kernel_isa_dg2, iGPUCopy_kernel_isa_size_dg2);
937938
device->SetInitKernelIsa((void*)pGPUInit_kernel_isa_dg2, iGPUInit_kernel_isa_size_dg2);
939+
#endif
938940

939941
m_cmhalDevice = device;
940942
m_cmhalDevice->SetGenPlatformInfo(PLATFORM_INTEL_DG2, PLATFORM_INTEL_GT2, "DG2");
941-
uint32_t cisaIDs[] = { GENX_DG2 , GENX_XEHP };
943+
#ifdef _MEDIA_RESVERED
944+
uint32_t cisaIDs[] = { GENX_DG2, GENX_XEHP };
945+
#else
946+
uint32_t cisaIDs[] = { GENX_TGLLP, GENX_DG2, GENX_XEHP };
947+
#endif
942948
m_cmhalDevice->AddSupportedCisaIDs(cisaIDs, sizeof(cisaIDs)/sizeof(uint32_t));
943949

944950
if (pCmState->skuTable && MEDIA_IS_SKU(pCmState->skuTable, FtrCCSNode))
@@ -951,7 +957,6 @@ MOS_STATUS CMHalInterfacesXe_Hpm::Initialize(CM_HAL_STATE *pCmState)
951957
m_cmhalDevice->m_l3ConfigCount = DG2_L3_CONFIG_COUNT;
952958
return MOS_STATUS_SUCCESS;
953959
}
954-
#endif
955960

956961
static bool dg2RegisteredRenderHal =
957962
MediaFactory<uint32_t, RenderHalDevice>::
@@ -1110,4 +1115,4 @@ MOS_STATUS CodechalInterfacesXe_Hpm::CreateCodecHalInterface(MhwInterfaces *mhwI
11101115
}
11111116
#endif // USE_CODECHAL_DEBUG_TOOL
11121117
return MOS_STATUS_SUCCESS;
1113-
}
1118+
}

media_driver/media_interface/media_interfaces_dg2/media_interfaces_dg2.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@
134134

135135
#include "cm_hal_xe_xpm.h"
136136

137-
#endif // _MEDIA_RESERVED
137+
#else // _MEDIA_RESERVED
138+
139+
#include "cm_hal_g12.h"
140+
141+
#endif // !_MEDIA_RESERVED
138142

139143
#include "vphal_xe_xpm.h"
140144
#include "vphal_xe_hpm.h"
@@ -356,15 +360,17 @@ static const L3ConfigRegisterValues DG2_L3_PLANES[DG2_L3_CONFIG_COUNT] =
356360
{0x80000000, 0x70000080, 0, 0}, // 256 0 0 224 32 512
357361
};
358362

359-
#ifdef _MEDIA_RESERVED
360363
class CMHalInterfacesXe_Hpm : public CMHalDevice
361364
{
362365
protected:
366+
#ifdef _MEDIA_RESERVED
363367
using CMHal = CmHalXe_Xpm;
368+
#else
369+
using CMHal = CM_HAL_G12_X;
370+
#endif
364371
MOS_STATUS Initialize(
365372
CM_HAL_STATE *pCmState);
366373
};
367-
#endif
368374

369375
class VphalInterfacesXe_Hpm : public VphalDevice
370376
{

0 commit comments

Comments
 (0)