diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
| commit | cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb (patch) | |
| tree | 06240ac00c9fee6a9ca97b778c63bfaa7ab6904d /drivers/gpu/drm/i915/intel_fbdev.c | |
| parent | 34882298b93e998d5fccde852b860e8fbe6c8f6b (diff) | |
| parent | 57127efaf1adc5e0bb2d3fa5a01bd97f71af7836 (diff) | |
Merge patches merged by Jani while I was on vacation.
Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 226fbc7d946..b8eac8c4dae 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -107,7 +107,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper, sizes->surface_depth); size = mode_cmd.pitches[0] * mode_cmd.height; - size = ALIGN(size, PAGE_SIZE); + size = PAGE_ALIGN(size); obj = i915_gem_object_create_stolen(dev, size); if (obj == NULL) obj = i915_gem_alloc_object(dev, size); |