fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 01:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/dev: Silence INTEL_FORCE_PROBE warning for intel_clc

Browse source 
Running intel_clc as part of the build doesn't need to issue this
warning.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29445>
This commit is contained in:
Jordan Justen 2024-05-28 12:21:20 -07:00 • committed by Marge Bot
parent fbe0f8d36d
commit fbf5ea6b44
3 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/compiler/intel_clc.c
View file

@ -663,7 +663,7 @@ int main(int argc, char **argv)
goto fail;
}
if (!intel_get_device_info_from_pci_id(pci_id, &params.devinfo)) {
if (!intel_get_device_info_for_build(pci_id, &params.devinfo)) {
fprintf(stderr, "Failed to get device information.\n");
goto fail;
}

33
src/intel/dev/intel_device_info.c
View file

@ -1475,7 +1475,7 @@ struct device_init_config {
#define FORCE_PROBE .require_force_probe = true
static bool
intel_device_info_init_common(int pci_id,
intel_device_info_init_common(int pci_id, bool building,
struct intel_device_info *devinfo)
{
struct device_init_config device_config = { 0 };
@ -1523,8 +1523,9 @@ intel_device_info_init_common(int pci_id,
return false;
} else if (device_config.require_force_probe) {
if (force_on) {
mesa_logw("Forcing probe of unsupported: %s (0x%x)", devinfo->name,
pci_id);
if (!building)
mesa_logw("Forcing probe of unsupported: %s (0x%x)", devinfo->name,
pci_id);
} else {
mesa_loge("%s (0x%x) requires INTEL_FORCE_PROBE", devinfo->name,
pci_id);
@ -1610,11 +1611,11 @@ intel_device_info_apply_workarounds(struct intel_device_info *devinfo)
devinfo->urb.max_entries[MESA_SHADER_GEOMETRY] = 1024;
}
bool
intel_get_device_info_from_pci_id(int pci_id,
struct intel_device_info *devinfo)
static bool
intel_get_device_info_from_pci_id_common(int pci_id, bool building,
struct intel_device_info *devinfo)
{
intel_device_info_init_common(pci_id, devinfo);
intel_device_info_init_common(pci_id, building, devinfo);
/* This is a placeholder until a proper value is set. */
devinfo->kmd_type = INTEL_KMD_TYPE_I915;
@ -1625,6 +1626,20 @@ intel_get_device_info_from_pci_id(int pci_id,
return true;
}
bool
intel_get_device_info_from_pci_id(int pci_id,
struct intel_device_info *devinfo)
{
return intel_get_device_info_from_pci_id_common(pci_id, false, devinfo);
}
bool
intel_get_device_info_for_build(int pci_id,
struct intel_device_info *devinfo)
{
return intel_get_device_info_from_pci_id_common(pci_id, true, devinfo);
}
bool
intel_device_info_compute_system_memory(struct intel_device_info *devinfo, bool update)
{
@ -1823,8 +1838,8 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo, int min
mesa_loge("Failed to query drm device.");
return false;
}
if (!intel_device_info_init_common(
drmdev->deviceinfo.pci->device_id, devinfo)) {
if (!intel_device_info_init_common(drmdev->deviceinfo.pci->device_id,
false, devinfo)) {
drmFreeDevice(&drmdev);
return false;
}

2
src/intel/dev/intel_device_info.h
View file

@ -184,6 +184,8 @@ intel_vram_all_mappable(const struct intel_device_info *devinfo)
bool intel_get_device_info_from_fd(int fh, struct intel_device_info *devinfo, int min_ver, int max_ver);
bool intel_get_device_info_from_pci_id(int pci_id,
struct intel_device_info *devinfo);
bool intel_get_device_info_for_build(int pci_id,
struct intel_device_info *devinfo);
/* Only updates intel_device_info::regions::...::free fields. The
* class/instance/size should remain the same over time.