diff options
| author |   Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-03-30 17:31:30 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-04-04 09:39:13 +0100 |
| commit | 7a3ee5deb46e1350b2c290d2b1fe0a2bc4087bff (patch) | |
| tree | e8bb385bc7348ba6f676870de79540d88c7bc38e /drivers/gpu/drm | |
| parent | drm/i915: Onion unwind for intel_init_ring_common() (diff) | |
| download | linux-dev-7a3ee5deb46e1350b2c290d2b1fe0a2bc4087bff.tar.xz linux-dev-7a3ee5deb46e1350b2c290d2b1fe0a2bc4087bff.zip | |
drm/i915: Remove user-triggerable WARN from i915_gem_object_create
Since this can be triggered by simply attempting a huge object,
a WARN_ON is not appropriate.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330163130.24141-1-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm')
| -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 bbc6f1c9f175..4ca88f2539c0 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4195,7 +4195,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size) * catch if we ever need to fix it. In the meantime, if you do spot * such a local variable, please consider fixing! */ - if (WARN_ON(size >> PAGE_SHIFT > INT_MAX)) + if (size >> PAGE_SHIFT > INT_MAX) return ERR_PTR(-E2BIG); if (overflows_type(size, obj->base.size)) |