From patchwork Mon Jul 7 18:44:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 4506461 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A4BB99F65E for ; Tue, 8 Jul 2014 16:13:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2B4D202F8 for ; Tue, 8 Jul 2014 16:13:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4DB55202FF for ; Tue, 8 Jul 2014 16:13:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00D6E6E58C; Tue, 8 Jul 2014 09:12:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailrelay004.isp.belgacom.be (mailrelay004.isp.belgacom.be [195.238.6.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 7DED76E251 for ; Mon, 7 Jul 2014 11:45:45 -0700 (PDT) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmQNAMzpulNXQCU9/2dsb2JhbABZgw6segUBAQEBAQEFAW4BkiiHRYEbF3WECwJTI4ECBxE3iC4DFQHDPQ2FfReFcIcKgigdhC0FmApsggCLTIIshhSDRTsv Received: from 61.37-64-87.adsl-dyn.isp.belgacom.be (HELO linux-zvq9.site) ([87.64.37.61]) by relay.skynet.be with ESMTP; 07 Jul 2014 20:45:42 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Subject: [PATCH 1/1] drm/gma500: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN Date: Mon, 7 Jul 2014 20:44:16 +0200 Message-Id: <1404758656-8615-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.8.4.5 X-Mailman-Approved-At: Tue, 08 Jul 2014 09:12:18 -0700 Cc: Fabian Frederick , dri-devel@lists.freedesktop.org, Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP use mm.h definition Cc: David Airlie Cc: Patrik Jakobsson Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Signed-off-by: Fabian Frederick --- drivers/gpu/drm/gma500/framebuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index e7fcc14..fc1f4e8 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -369,7 +369,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((bpp + 7) / 8), 4096 >> pitch_lines); size = mode_cmd.pitches[0] * mode_cmd.height; - size = ALIGN(size, PAGE_SIZE); + size = PAGE_ALIGN(size); /* Allocate the fb in the GTT with stolen page backing */ backing = psbfb_alloc(dev, size); @@ -397,7 +397,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((bpp + 7) / 8), 64); size = mode_cmd.pitches[0] * mode_cmd.height; - size = ALIGN(size, PAGE_SIZE); + size = PAGE_ALIGN(size); /* Allocate the framebuffer in the GTT with stolen page backing */ backing = psbfb_alloc(dev, size);