anv: Pull aperture size from devinfo
Reviwed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13610>
This commit is contained in:
parent
2254146d0a
commit
0b2b9b49af
|
@ -1372,7 +1372,7 @@ query_topology(struct intel_device_info *devinfo, int fd)
|
|||
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
intel_get_aperture_size(int fd, uint64_t *size)
|
||||
{
|
||||
struct drm_i915_gem_get_aperture aperture = { 0 };
|
||||
|
|
|
@ -428,7 +428,6 @@ intel_device_info_timebase_scale(const struct intel_device_info *devinfo,
|
|||
bool intel_get_device_info_from_fd(int fh, struct intel_device_info *devinfo);
|
||||
bool intel_get_device_info_from_pci_id(int pci_id,
|
||||
struct intel_device_info *devinfo);
|
||||
int intel_get_aperture_size(int fd, uint64_t *size);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -441,10 +441,11 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd)
|
|||
anv_perf_warn(VK_LOG_NO_OBJS(&device->instance->vk),
|
||||
"Failed to get I915_CONTEXT_PARAM_GTT_SIZE: %m");
|
||||
|
||||
if (intel_get_aperture_size(fd, &device->gtt_size) == -1) {
|
||||
if (device->info.aperture_bytes == 0) {
|
||||
return vk_errorf(device, VK_ERROR_INITIALIZATION_FAILED,
|
||||
"failed to get aperture size: %m");
|
||||
}
|
||||
device->gtt_size = device->info.aperture_bytes;
|
||||
}
|
||||
|
||||
/* We only allow 48-bit addresses with softpin because knowing the actual
|
||||
|
|
Loading…
Reference in New Issue