mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
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: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
0d68b25e9c
commit
1267a26b22
2 changed files with 6 additions and 6 deletions
|
@ -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,
|
aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
|
||||||
plane_config->tiled);
|
plane_config->tiled);
|
||||||
|
|
||||||
plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
|
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
||||||
aligned_height, PAGE_SIZE);
|
aligned_height);
|
||||||
|
|
||||||
DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
|
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,
|
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,
|
aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
|
||||||
plane_config->tiled);
|
plane_config->tiled);
|
||||||
|
|
||||||
plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
|
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
||||||
aligned_height, PAGE_SIZE);
|
aligned_height);
|
||||||
|
|
||||||
DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
|
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,
|
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)
|
intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp)
|
||||||
{
|
{
|
||||||
u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, 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 *
|
static struct drm_framebuffer *
|
||||||
|
|
|
@ -107,7 +107,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
|
||||||
sizes->surface_depth);
|
sizes->surface_depth);
|
||||||
|
|
||||||
size = mode_cmd.pitches[0] * mode_cmd.height;
|
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);
|
obj = i915_gem_object_create_stolen(dev, size);
|
||||||
if (obj == NULL)
|
if (obj == NULL)
|
||||||
obj = i915_gem_alloc_object(dev, size);
|
obj = i915_gem_alloc_object(dev, size);
|
||||||
|
|
Loading…
Reference in a new issue