diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2017-03-22 15:28:07 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2017-04-04 14:53:22 -0700 |
| commit | e6d607d55d1cbfd3be63c4e5d3a38c98f54cee12 (patch) | |
| tree | 00ae23c36348d84bcb66e5c9ea25fbd9fa3d0c7c | |
| parent | 863f00c0d626426274dedc1b5b4d1626ec942690 (diff) | |
i965/drm: Drop has_wait_timeout.
We require Kernel 3.6 and fail screen creation if this doesn't exist.
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_bufmgr_gem.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c index 339e2034b0..8f9fbdf74b 100644 --- a/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c +++ b/src/mesa/drivers/dri/i965/intel_bufmgr_gem.c @@ -151,7 +151,6 @@ typedef struct _drm_bacon_bufmgr { unsigned int has_bsd : 1; unsigned int has_blt : 1; unsigned int has_llc : 1; - unsigned int has_wait_timeout : 1; unsigned int bo_reuse : 1; unsigned int no_exec : 1; unsigned int has_vebox : 1; @@ -1663,17 +1662,6 @@ drm_bacon_gem_bo_wait(drm_bacon_bo *bo, int64_t timeout_ns) struct drm_i915_gem_wait wait; int ret; - if (!bufmgr->has_wait_timeout) { - DBG("%s:%d: Timed wait is not supported. Falling back to " - "infinite wait\n", __FILE__, __LINE__); - if (timeout_ns) { - drm_bacon_bo_wait_rendering(bo); - return 0; - } else { - return drm_bacon_bo_busy(bo) ? -ETIME : 0; - } - } - memclear(wait); wait.bo_handle = bo_gem->gem_handle; wait.timeout_ns = timeout_ns; @@ -3062,10 +3050,6 @@ drm_bacon_bufmgr_gem_init(int fd, int batch_size) ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GETPARAM, &gp); bufmgr->has_exec_async = ret == 0; - gp.param = I915_PARAM_HAS_WAIT_TIMEOUT; - ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GETPARAM, &gp); - bufmgr->has_wait_timeout = ret == 0; - gp.param = I915_PARAM_HAS_LLC; ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GETPARAM, &gp); if (ret != 0) { |