Skip to content

Commit

Permalink
[Media Common] [VP] Fix query HW config error for XE KMD
Browse files Browse the repository at this point in the history 
Fix query HW config error for XE KMD
  • Loading branch information
@Effieyu0 @intel-mediadev
Effieyu0 authored and intel-mediadev committed Aug 8, 2024
1 parent dbf60cc commit e56e0fa
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 17 deletions.
2 changes: 1 addition & 1 deletion media_softlet/linux/common/os/i915/mos_bufmgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5129,7 +5129,7 @@ static int mos_bufmgr_query_device_blob(struct mos_bufmgr *bufmgr, MEDIA_SYSTEM_
gfx_info->MaxEuPerSubSlice = hw_info[i+2];
}

if (INTEL_HWCONFIG_L3_CACHE_SIZE_IN_KB == hw_info[i])
if (INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB == hw_info[i])
{
if (hw_info[i+1] != 1)
{
Expand Down
2 changes: 1 addition & 1 deletion media_softlet/linux/common/os/i915_production/mos_bufmgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5085,7 +5085,7 @@ static int mos_bufmgr_query_device_blob(struct mos_bufmgr *bufmgr, MEDIA_SYSTEM_
gfx_info->MaxEuPerSubSlice = hw_info[i+2];
}

if (INTEL_HWCONFIG_L3_CACHE_SIZE_IN_KB == hw_info[i])
if (INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB == hw_info[i])
{
if (hw_info[i+1] != 1)
{
Expand Down
54 changes: 44 additions & 10 deletions media_softlet/linux/common/os/intel_hwconfig_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
#define _INTEL_HWCONFIG_TYPES_H_

/**
* enum intel_hwconfig - Global definition of hwconfig blob attributes
* enum intel_hwconfig - Global definition of hwconfig table attributes
*
* Intel devices provide a KLV (Key/Length/Value) blob containing
* the static hardware configuration for that giving platform.
* Intel devices provide a KLV (Key/Length/Value) table containing
* the static hardware configuration for that platform.
* This header defines the current attribute keys for this KLV.
*/
enum intel_hwconfig {
enum intel_hwconfig_keys {
INTEL_HWCONFIG_MAX_SLICES_SUPPORTED = 1,
INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED, /* 2 */
INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS, /* 3 */
INTEL_HWCONFIG_NUM_PIXEL_PIPES, /* 4 */
INTEL_HWCONFIG_MAX_NUM_GEOMETRY_PIPES, /* 5 */
INTEL_HWCONFIG_L3_CACHE_SIZE_IN_KB, /* 6 */
INTEL_HWCONFIG_L3_BANK_COUNT, /* 7 */
INTEL_HWCONFIG_DEPRECATED_MAX_NUM_GEOMETRY_PIPES, /* 5 */
INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB, /* 6 */
INTEL_HWCONFIG_DEPRECATED_L3_BANK_COUNT, /* 7 */
INTEL_HWCONFIG_L3_CACHE_WAYS_SIZE_IN_BYTES, /* 8 */
INTEL_HWCONFIG_L3_CACHE_WAYS_PER_SECTOR, /* 9 */
INTEL_HWCONFIG_MAX_MEMORY_CHANNELS, /* 10 */
Expand All @@ -31,22 +31,22 @@ enum intel_hwconfig {
* For example, 4KB and 64KB will be listed as (SZ_4K | SZ_64K)
*/
INTEL_HWCONFIG_LOCAL_MEMORY_PAGE_SIZES_SUPPORTED, /* 13 */
INTEL_HWCONFIG_SLM_SIZE_IN_KB, /* 14 */
INTEL_HWCONFIG_DEPRECATED_SLM_SIZE_IN_KB, /* 14 */
INTEL_HWCONFIG_NUM_THREADS_PER_EU, /* 15 */
INTEL_HWCONFIG_TOTAL_VS_THREADS, /* 16 */
INTEL_HWCONFIG_TOTAL_GS_THREADS, /* 17 */
INTEL_HWCONFIG_TOTAL_HS_THREADS, /* 18 */
INTEL_HWCONFIG_TOTAL_DS_THREADS, /* 19 */
INTEL_HWCONFIG_TOTAL_VS_THREADS_POCS, /* 20 */
INTEL_HWCONFIG_TOTAL_PS_THREADS, /* 21 */
INTEL_HWCONFIG_MAX_FILL_RATE, /* 22 */
INTEL_HWCONFIG_DEPRECATED_MAX_FILL_RATE, /* 22 */
INTEL_HWCONFIG_MAX_RCS, /* 23 */
INTEL_HWCONFIG_MAX_CCS, /* 24 */
INTEL_HWCONFIG_MAX_VCS, /* 25 */
INTEL_HWCONFIG_MAX_VECS, /* 26 */
INTEL_HWCONFIG_MAX_COPY_CS, /* 27 */
/* URB Size might be configurable by UMD in certain platforms */
INTEL_HWCONFIG_URB_SIZE_IN_KB, /* 28 */
INTEL_HWCONFIG_DEPRECATED_URB_SIZE_IN_KB, /* 28 */
INTEL_HWCONFIG_MIN_VS_URB_ENTRIES, /* 29 */
INTEL_HWCONFIG_MAX_VS_URB_ENTRIES, /* 30 */
INTEL_HWCONFIG_MIN_PCS_URB_ENTRIES, /* 31 */
Expand All @@ -65,6 +65,40 @@ enum intel_hwconfig {
INTEL_HWCONFIG_VS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT, /* 44 */
INTEL_HWCONFIG_DS_MIN_DEREF_BLOCK_SIZE_HANDLE_COUNT, /* 45 */
INTEL_HWCONFIG_NUM_RT_STACKS_PER_DSS, /* 46 */
INTEL_HWCONFIG_MAX_URB_STARTING_ADDRESS, /* 47 */
INTEL_HWCONFIG_MIN_CS_URB_ENTRIES, /* 48 */
INTEL_HWCONFIG_MAX_CS_URB_ENTRIES, /* 49 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_URB, /* 50 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_REST, /* 51 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_DC, /* 52 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RO, /* 53 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_Z, /* 54 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COLOR, /* 55 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_UNIFIED_TILE_CACHE, /* 56 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_COMMAND_BUFFER, /* 57 */
INTEL_HWCONFIG_L3_ALLOC_PER_BANK_RW, /* 58 */
INTEL_HWCONFIG_MAX_NUM_L3_CONFIGS, /* 59 */
INTEL_HWCONFIG_BINDLESS_SURFACE_OFFSET_BIT_COUNT, /* 60 */
INTEL_HWCONFIG_RESERVED_CCS_WAYS, /* 61 */
INTEL_HWCONFIG_CSR_SIZE_IN_MB, /* 62 */
INTEL_HWCONFIG_GEOMETRY_PIPES_PER_SLICE, /* 63 */
INTEL_HWCONFIG_L3_BANK_SIZE_IN_KB, /* 64 */
INTEL_HWCONFIG_SLM_SIZE_PER_DSS, /* 65 */
INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_SLICE, /* 66 */
INTEL_HWCONFIG_MAX_PIXEL_FILL_RATE_PER_DSS, /* 67 */
INTEL_HWCONFIG_URB_SIZE_PER_SLICE_IN_KB, /* 68 */
INTEL_HWCONFIG_URB_SIZE_PER_L3_BANK_COUNT_IN_KB, /* 69 */
INTEL_HWCONFIG_MAX_SUBSLICE, /* 70 */
INTEL_HWCONFIG_MAX_EU_PER_SUBSLICE, /* 71 */
INTEL_HWCONFIG_RAMBO_L3_BANK_SIZE_IN_KB, /* 72 */
INTEL_HWCONFIG_SLM_SIZE_PER_SS_IN_KB, /* 73 */
INTEL_HWCONFIG_NUM_HBM_STACKS_PER_TILE, /* 74 */
INTEL_HWCONFIG_NUM_CHANNELS_PER_HBM_STACK, /* 75 */
INTEL_HWCONFIG_HBM_CHANNEL_WIDTH_IN_BYTES, /* 76 */
INTEL_HWCONFIG_MIN_TASK_URB_ENTRIES, /* 77 */
INTEL_HWCONFIG_MAX_TASK_URB_ENTRIES, /* 78 */
INTEL_HWCONFIG_MIN_MESH_URB_ENTRIES, /* 79 */
INTEL_HWCONFIG_MAX_MESH_URB_ENTRIES, /* 80 */
__INTEL_HWCONFIG_MAX
};

Expand Down
14 changes: 9 additions & 5 deletions media_softlet/linux/common/os/xe/mos_bufmgr_xe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2839,20 +2839,22 @@ mos_query_device_blob_xe(struct mos_bufmgr *bufmgr, MEDIA_SYSTEM_INFO* gfx_info)
gfx_info->MaxSlicesSupported = hwconfig[i+2];
}

if (INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED == hwconfig[i])
if ((INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED == hwconfig[i])
|| (INTEL_HWCONFIG_MAX_SUBSLICE == hwconfig[i]))
{
assert(hwconfig[i+1] == 1);
gfx_info->SubSliceCount = hwconfig[i+2];
gfx_info->MaxSubSlicesSupported = hwconfig[i+2];
}

if (INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS == hwconfig[i])
if ((INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS == hwconfig[i])
|| (INTEL_HWCONFIG_MAX_EU_PER_SUBSLICE == hwconfig[i]))
{
assert(hwconfig[i+1] == 1);
gfx_info->MaxEuPerSubSlice = hwconfig[i+2];
}

if (INTEL_HWCONFIG_L3_CACHE_SIZE_IN_KB == hwconfig[i])
if (INTEL_HWCONFIG_DEPRECATED_L3_CACHE_SIZE_IN_KB == hwconfig[i])
{
assert(hwconfig[i+1] == 1);
gfx_info->L3CacheSizeInKb = hwconfig[i+2];
Expand Down Expand Up @@ -3216,13 +3218,15 @@ mos_get_driver_info_xe(struct mos_bufmgr *bufmgr, struct LinuxDriverInfo *drvInf
drvInfo->sliceCount = hw_config[i+2];
}

if (INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED == hw_config[i])
if ((INTEL_HWCONFIG_MAX_DUAL_SUBSLICES_SUPPORTED == hw_config[i])
|| (INTEL_HWCONFIG_MAX_SUBSLICE == hw_config[i]))
{
assert(hw_config[i+1] == 1);
drvInfo->subSliceCount = hw_config[i+2];
}

if (INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS == hw_config[i])
if ((INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS == hw_config[i])
|| (INTEL_HWCONFIG_MAX_EU_PER_SUBSLICE == hw_config[i]))
{
assert(hw_config[i+1] == 1);
MaxEuPerSubSlice = hw_config[i+2];
Expand Down

0 comments on commit e56e0fa

Please sign in to comment.