Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1267a26b authored by Fabian Frederick's avatar Fabian Frederick Committed by Jani Nikula
Browse files

drm/i915: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN 



use mm.h definition

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0d68b25e

drivers/gpu/drm/i915/intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -6209,8 +6209,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,
@@ -7229,8 +7229,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,
@@ -8318,7 +8318,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 *

drivers/gpu/drm/i915/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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);