KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ilo: do not set I915_EXEC_NO_RELOC 

This reverts most of commit d80f0c34b7.  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.
This commit is contained in:
Chia-I Wu 2014-03-10 19:03:14 +08:00
parent 5ecdd7ba22
commit 952fda4d3f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/winsys/intel/drm/intel_drm_winsys.c
View File

@ -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)