diff options
| author | Chris Wilson | 2016-12-23 15:57:58 +0100 |
|---|---|---|
| committer | Chris Wilson | 2016-12-23 17:07:32 +0100 |
| commit | 8bfc478fa455b4908f745df368355b415460c60e (patch) | |
| tree | 6b015f2468c6b4f124ae6119bd25eeae75daa21f /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Don't clflush before release phys object (diff) | |
| download | kernel-qcow2-linux-8bfc478fa455b4908f745df368355b415460c60e.tar.gz kernel-qcow2-linux-8bfc478fa455b4908f745df368355b415460c60e.tar.xz kernel-qcow2-linux-8bfc478fa455b4908f745df368355b415460c60e.zip | |
drm/i915: Silence allocation failure during sg_trim()
As trimming the sg table is merely an optimisation that gracefully fails
if we cannot allocate a new table, we do not need to report the failure
either.
Fixes: 0c40ce130e38 ("drm/i915: Trim the object sg table")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161223145804.6605-4-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 82fc4d4c665e..40962f61cfed 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2326,7 +2326,7 @@ static void i915_sg_trim(struct sg_table *orig_st) if (orig_st->nents == orig_st->orig_nents) return; - if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL)) + if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL | __GFP_NOWARN)) return; new_sg = new_st.sgl; |