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

anv: use initialization routine for gen_device_info

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Mark Janes 2019-07-25 10:40:55 -07:00
parent 49465f1330
commit e4a0070db4
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/intel/vulkan/anv_device.c
View file

@ -390,19 +390,15 @@ anv_physical_device_init(struct anv_physical_device *device,
assert(strlen(path) < ARRAY_SIZE(device->path));
snprintf(device->path, ARRAY_SIZE(device->path), "%s", path);
device->no_hw = getenv("INTEL_NO_HW") != NULL;
const int pci_id_override = gen_get_pci_device_id_override();
if (pci_id_override < 0) {
device->chipset_id = anv_gem_get_param(fd, I915_PARAM_CHIPSET_ID);
if (!device->chipset_id) {
result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail;
}
} else {
device->chipset_id = pci_id_override;
device->no_hw = true;
if (!gen_get_device_info_from_fd(fd, &device->info)) {
result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail;
}
device->chipset_id = device->info.chipset_id;
device->no_hw = device->info.no_hw;
if (getenv("INTEL_NO_HW") != NULL)
device->no_hw = true;
device->pci_info.domain = drm_device->businfo.pci->domain;
device->pci_info.bus = drm_device->businfo.pci->bus;
@ -410,10 +406,6 @@ anv_physical_device_init(struct anv_physical_device *device,
device->pci_info.function = drm_device->businfo.pci->func;
device->name = gen_get_device_name(device->chipset_id);
if (!gen_get_device_info(device->chipset_id, &device->info)) {
result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail;
}
if (device->info.is_haswell) {
intel_logw("Haswell Vulkan support is incomplete");