diff options
| author | Dave Airlie | 2015-03-09 10:58:30 +0100 |
|---|---|---|
| committer | Dave Airlie | 2015-03-09 10:58:30 +0100 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | kernel-qcow2-linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.gz kernel-qcow2-linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.xz kernel-qcow2-linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.zip | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index f1de95f7432c..f8da71682c96 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -485,10 +485,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, stolen_offset, gtt_offset, size); /* KISS and expect everything to be page-aligned */ - BUG_ON(stolen_offset & 4095); - BUG_ON(size & 4095); - - if (WARN_ON(size == 0)) + if (WARN_ON(size == 0) || WARN_ON(size & 4095) || + WARN_ON(stolen_offset & 4095)) return NULL; stolen = kzalloc(sizeof(*stolen), GFP_KERNEL); |