diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2014-03-10 19:03:14 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2014-03-10 19:04:43 +0800 |
| commit | 952fda4d3feca9b676a12d011523feaaf5836086 (patch) | |
| tree | 293041911bd789d317f5137e25863bf1e9ef9e8e | |
| parent | 5ecdd7ba22945ce4e3a10b26c6f34a19eceeb289 (diff) | |
ilo: do not set I915_EXEC_NO_RELOC
This reverts most of commit d80f0c34b733a874adfdd3a2267e4deec345cc6b. Upon a
closer reading, having the presumed offsets written is not enough to set the
flag. EXEC_OBJECT_NEEDS_GTT and/or EXEC_OBJECT_WRITE of the reloc entries
must also be set appropriately.
| -rw-r--r-- | src/gallium/winsys/intel/drm/intel_drm_winsys.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c index 250b36f524b..d34246af9eb 100644 --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c @@ -49,7 +49,6 @@ struct intel_winsys { int fd; drm_intel_bufmgr *bufmgr; struct intel_winsys_info info; - unsigned long exec_flags; /* these are protected by the mutex */ pipe_mutex mutex; @@ -158,14 +157,6 @@ probe_winsys(struct intel_winsys *winsys) get_param(winsys, I915_PARAM_HAS_GEN7_SOL_RESET, &val); info->has_gen7_sol_reset = val; - /* - * pipe drivers are expected to write the presumed offsets after adding - * reloc entries - */ - get_param(winsys, I915_PARAM_HAS_EXEC_NO_RELOC, &val); - if (val) - winsys->exec_flags |= I915_EXEC_NO_RELOC; - return true; } @@ -419,8 +410,7 @@ intel_winsys_submit_bo(struct intel_winsys *winsys, struct intel_context *ctx, unsigned long flags) { - const unsigned long exec_flags = - winsys->exec_flags | (unsigned long) ring | flags; + const unsigned long exec_flags = (unsigned long) ring | flags; /* logical contexts are only available for the render ring */ if (ring != INTEL_RING_RENDER) |