On Tue, 01 Jul 2014, Fabian Frederick <f...@skynet.be> wrote:
> use mm.h definition
>
> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
> Cc: Jani Nikula <jani.nik...@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-de...@lists.freedesktop.org
> Signed-off-by: Fabian Frederick <f...@skynet.be>
Pushed to drm-intel-next-queued, thanks for the patch.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
> drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 5f285fb..f07cb83 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6116,8 +6116,8 @@ static void i9xx_get_plane_config(struct intel_crtc
> *crtc,
> aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
> plane_config->tiled);
>
> - plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
> - aligned_height, PAGE_SIZE);
> + plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
> + aligned_height);
>
> DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x,
> pitch %d, size 0x%x\n",
> pipe, plane, crtc->base.primary->fb->width,
> @@ -7136,8 +7136,8 @@ static void ironlake_get_plane_config(struct intel_crtc
> *crtc,
> aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
> plane_config->tiled);
>
> - plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
> - aligned_height, PAGE_SIZE);
> + plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
> + aligned_height);
>
> DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x,
> pitch %d, size 0x%x\n",
> pipe, plane, crtc->base.primary->fb->width,
> @@ -8233,7 +8233,7 @@ static u32
> intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp)
> {
> u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, bpp);
> - return ALIGN(pitch * mode->vdisplay, PAGE_SIZE);
> + return PAGE_ALIGN(pitch * mode->vdisplay);
> }
>
> static struct drm_framebuffer *
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c
> b/drivers/gpu/drm/i915/intel_fbdev.c
> index 088fe93..182fbc2 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -81,7 +81,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);
> --
> 1.9.1
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
