aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-12-23 09:57:58 -0500
committerJani Nikula <jani.nikula@intel.com>2017-01-03 04:41:48 -0500
commit64d1461ce0c3b8ecc1c6b61f4ad1c1d10ce971a3 (patch)
treeffc4e159687f086f1db977f26460d8b229c5f3c3
parentc3f923b5545306570eff00d11ca051bd67699a23 (diff)
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 (cherry picked from commit 8bfc478fa455b4908f745df368355b415460c60e) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
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 30a1322c8677..5d146f9f4aad 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2324,7 +2324,7 @@ static void i915_sg_trim(struct sg_table *orig_st)
2324 if (orig_st->nents == orig_st->orig_nents) 2324 if (orig_st->nents == orig_st->orig_nents)
2325 return; 2325 return;
2326 2326
2327 if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL)) 2327 if (sg_alloc_table(&new_st, orig_st->nents, GFP_KERNEL | __GFP_NOWARN))
2328 return; 2328 return;
2329 2329
2330 new_sg = new_st.sgl; 2330 new_sg = new_st.sgl;