diff options
| author | Chris Wilson | 2017-10-13 22:26:13 +0200 |
|---|---|---|
| committer | Chris Wilson | 2017-10-16 21:44:19 +0200 |
| commit | f1fa4f442c82eb875babb88399a6b69efce7b453 (patch) | |
| tree | 60ac898b028aba4348202034b75562a207b0c446 /drivers/gpu/drm/i915/i915_gem_render_state.c | |
| parent | drm/i915/cnl: WaRsUseTimeoutMode (diff) | |
| download | kernel-qcow2-linux-f1fa4f442c82eb875babb88399a6b69efce7b453.tar.gz kernel-qcow2-linux-f1fa4f442c82eb875babb88399a6b69efce7b453.tar.xz kernel-qcow2-linux-f1fa4f442c82eb875babb88399a6b69efce7b453.zip | |
drm/i915: Refactor testing obj->mm.pages
Since we occasionally stuff an error pointer into obj->mm.pages for a
semi-permanent or even permanent failure, we have to be more careful and
not just test against NULL when deciding if the object has a complete
set of its concurrent pages.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171013202621.7276-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_render_state.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_render_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c index 4dd4c2159a92..3703dc91eeda 100644 --- a/drivers/gpu/drm/i915/i915_gem_render_state.c +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c @@ -229,7 +229,7 @@ int i915_gem_render_state_emit(struct drm_i915_gem_request *req) return 0; /* Recreate the page after shrinking */ - if (!so->vma->obj->mm.pages) + if (!i915_gem_object_has_pages(so->vma->obj)) so->batch_offset = -1; ret = i915_vma_pin(so->vma, 0, 0, PIN_GLOBAL | PIN_HIGH); |