diff options
| author | Ville Syrjälä | 2017-09-07 16:32:03 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2017-09-07 19:12:36 +0200 |
| commit | 750fae232480fee9d799eaced198ec98c20769a3 (patch) | |
| tree | 5eec6e3bdfc996a15c5965b3e0d7c73421435a4e /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Disable mmio debugging during user access (diff) | |
| download | kernel-qcow2-linux-750fae232480fee9d799eaced198ec98c20769a3.tar.gz kernel-qcow2-linux-750fae232480fee9d799eaced198ec98c20769a3.tar.xz kernel-qcow2-linux-750fae232480fee9d799eaced198ec98c20769a3.zip | |
i915: Fix obj size vs. alignment for drm_pci_alloc()
drm_pci_alloc() refuses to cooperate if the passed alignment exceeds the
object size. So round up the obj size to the next power of two as well
to make this actually work.
Obviously things work just fine as long as the size was a power of two
to begin with. However kms_cursor_crc doesn't always use power of two
sizes so we hit a failure when we try to allocate the phys memory.
Testcase: igt/kms_cursor_crc
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170907143203.13055-1-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <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 4dffebae5601..822719fa1b52 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -179,7 +179,7 @@ i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) * the alignment of the buddy allocation will naturally match. */ phys = drm_pci_alloc(obj->base.dev, - obj->base.size, + roundup_pow_of_two(obj->base.size), roundup_pow_of_two(obj->base.size)); if (!phys) return ERR_PTR(-ENOMEM); |