diff options
| author | Owen Taylor <otaylor@redhat.com> | 2008-11-03 23:38:17 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-11-11 08:43:26 +0100 |
| commit | 6a47baa6ce7e6fb5fed8d1fd0af36a96a4ad133f (patch) | |
| tree | 7ad2e9ab0495856bc315bbf9640416ee1f70323b /drivers | |
| parent | i915: Clean up sarea pointers on leavevt (diff) | |
| download | linux-6a47baa6ce7e6fb5fed8d1fd0af36a96a4ad133f.tar.xz linux-6a47baa6ce7e6fb5fed8d1fd0af36a96a4ad133f.zip | |
i915: Don't attempt to short-circuit object_wait_rendering by checking domains.
This could return early when reading after writing a buffer, if somebody
had already put it on the flushing list (write domains are 0, but still
active), leading to glReadPixels failure.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b0ec73fa6a93..6b4a2bd20640 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1455,11 +1455,9 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj, read_domains, write_domain); /* Wait on any GPU rendering to the object to be flushed. */ - if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) { - ret = i915_gem_object_wait_rendering(obj); - if (ret) - return ret; - } + ret = i915_gem_object_wait_rendering(obj); + if (ret) + return ret; if (obj_priv->page_cpu_valid == NULL) { obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE, |