diff options
| author | Rafael Antognolli <rafael.antognolli@intel.com> | 2020-05-14 11:44:29 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-15 16:57:04 +0000 |
| commit | bb3545a6ee419c4802ac4153eb690a93dc2f339d (patch) | |
| tree | 3f4e34cf6f129675028c2f151de9ffa285dc8052 /src/mesa/drivers | |
| parent | a887ad7c84e14fdad7907037a39e9fee9d504bf3 (diff) | |
intel: Store the aperture size in devinfo.
We will later use the devinfo from iris_bufmgr, where we don't have
access to the screen pointer. And since we are moving it, we can reuse
it in Anv and i965.
v2: return error code and check for it on Anv (Lionel).
v3: Remove anv_gem_get_aperture() from anv_private.h and stubs (Lionel).
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5043>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index f2fbe70cada..8f5e4102cb6 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1505,17 +1505,6 @@ static const __DRIimageExtension intelImageExtension = { .queryDmaBufFormatModifierAttribs = intel_query_format_modifier_attribs, }; -static uint64_t -get_aperture_size(int fd) -{ - struct drm_i915_gem_get_aperture aperture; - - if (drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture) != 0) - return 0; - - return aperture.aper_size; -} - static int brw_query_renderer_integer(__DRIscreen *dri_screen, int param, unsigned int *value) @@ -2610,7 +2599,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) screen->max_gtt_map_object_size = gtt_size / 4; } - screen->aperture_threshold = get_aperture_size(screen->fd) * 3 / 4; + screen->aperture_threshold = devinfo->aperture_bytes * 3 / 4; screen->hw_has_swizzling = intel_detect_swizzling(screen); screen->hw_has_timestamp = intel_detect_timestamp(screen); |