OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/dev: fix intel_device_info_is_adln check

Browse Source 
We cannot compare pointer, patch adds is_adl_n to devinfo for detection.

Fixes: 3cf71ddfac ("intel/dev: provide intel_device_info_is_adln helper")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25934>
This commit is contained in:
Tapani Pälli
2023-10-27 08:44:40 +03:00
committed by Marge Bot
parent 9bd47aabaf
commit 2833d1ade1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/intel/dev/intel_device_info.c
View File

@@ -1009,6 +1009,7 @@ static const struct intel_device_info intel_device_info_adl_n = {
GFX12_GT_FEATURES(1), GFX12_GT_FEATURES(1),
.platform = INTEL_PLATFORM_ADL, .platform = INTEL_PLATFORM_ADL,
.display_ver = 13, .display_ver = 13,
.is_adl_n = true,
}; };
static const struct intel_device_info intel_device_info_adl_gt2 = { static const struct intel_device_info intel_device_info_adl_gt2 = {
@@ -1151,12 +1152,6 @@ static const struct intel_device_info intel_device_info_mtl_p = {
.platform = INTEL_PLATFORM_MTL_P, .platform = INTEL_PLATFORM_MTL_P,
}; };
bool
intel_device_info_is_adln(const struct intel_device_info *devinfo)
{
return devinfo == &intel_device_info_adl_n;
}
void void
intel_device_info_topology_reset_masks(struct intel_device_info *devinfo) intel_device_info_topology_reset_masks(struct intel_device_info *devinfo)
{ {

9
src/intel/dev/intel_device_info.h
View File

@@ -101,8 +101,8 @@ enum intel_platform {
#define intel_device_info_is_mtl(devinfo) \ #define intel_device_info_is_mtl(devinfo) \
intel_platform_in_range((devinfo)->platform, MTL) intel_platform_in_range((devinfo)->platform, MTL)
bool #define intel_device_info_is_adln(devinfo) \
intel_device_info_is_adln(const struct intel_device_info *devinfo); (devinfo->is_adl_n == true)
struct intel_memory_class_instance { struct intel_memory_class_instance {
/* Kernel backend specific class value, no translation needed yet */ /* Kernel backend specific class value, no translation needed yet */
@@ -204,6 +204,11 @@ struct intel_device_info
* fragment shader instructions. * fragment shader instructions.
*/ */
bool needs_unlit_centroid_workaround; bool needs_unlit_centroid_workaround;
/**
* We need this for ADL-N specific Wa_14014966230.
*/
bool is_adl_n;
/** @} */ /** @} */
/** /**