From patchwork Mon Oct 24 11:27:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp439966wru; Mon, 24 Oct 2022 06:03:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6WnRWJSVoQ9XVpt8VTMmP2o2JbFa0nisCzPwJzTgBTzV7EKqCgUr5ISd4+WnoS2Vi3C688 X-Received: by 2002:a17:902:d484:b0:17f:7437:565d with SMTP id c4-20020a170902d48400b0017f7437565dmr33153048plg.154.1666616615058; Mon, 24 Oct 2022 06:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616615; cv=none; d=google.com; s=arc-20160816; b=QHXhx05yAFjgUA3sVkynILB5avHmUKq5n3fy87la9oR+kRImQnB7q23kPfJHiJp2oo tPlJbXwZEN5Yepv7ZDmmMHk4aB95jDGSGs+NQGskpHv3rsvI8xgXFPUBxBRUO72cw1Nn eOScTbnDpiPNemv1jSqgyz8Ai7+0Vsun+kjhbbpTza3A0CHl/Zqfj/qoTwRbLa1i8G27 J9Y8DHBXEciW5Fr0Cxd5Wh1Gt/sjLt2briMVb1KCQGxcngpykL9XYHFZq0RlmjgNAKI7 yX6nop4hGoXYrTWm2WX0APLuBLAUkRRGFNnjnwt9XNqT2GAVTWgbW2XUhAPolFjevF0b C1jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0iXjiI1uzDUFY4xmp74E6j77SdFazKA7znoCBQisjxM=; b=CdL2yyccXwDfVn4Tp6XFWjNra1sr/e3hsqVcWkxo9W6bSnJwRsMvYpDwOr4xHxXwe4 kxXEK5vLlfRQrdnEy0PHKJkR4OgmO4LYog4YzqhruHexfOBT0l4Xtts0OrPFIe9w7ZS4 5wQEH6HUJ+qVWDx+wVzkk6YHGqrbTvnqxfnsLlIwKzS2OtEbrB3K2P+Ow5SCPhntLJsY u0+TetYx+G7Lo0VhhkdIvKAsQ1xWbtEaZhqfHAZJ5bYnwDAKcQgbxZyQF7zLoMY7lmcF UnEXWeQ0KopFDN58G5RVXDZDgHUO4zB6TTYfpqXK0t7oivrtNTl7wWMgegwFeamcJtHp D5Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uQwAPuVr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a632c03000000b00460c67afbd9si9779823pgs.771.2022.10.24.06.02.47; Mon, 24 Oct 2022 06:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uQwAPuVr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235053AbiJXNCK (ORCPT + 99 others); Mon, 24 Oct 2022 09:02:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235144AbiJXM7Z (ORCPT ); Mon, 24 Oct 2022 08:59:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5B569AC1B; Mon, 24 Oct 2022 05:18:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 714AF612C3; Mon, 24 Oct 2022 12:17:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 843A5C433D6; Mon, 24 Oct 2022 12:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613836; bh=Ys3ka49cccFJzfsTCTuZ+erQPYHY5yRX3BygybRzjkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQwAPuVreDBRQzb+Q1lJi5xqGEWZueMXhWTDUFg4n97djBTGqA2tCFDo/aRf1Tkef SDmuZXwAkdQ1PDrwOKhl+S+JX5CgdmrZBzfsIp+OwGyCO4jVOHBAsFnhKAvD0U0Ly0 C9SOsHEgmZ+xmrGntU23iZEPxkaZ6P6iqf6Z56V4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.10 033/390] parisc: fbdev/stifb: Align graphics memory size to 4MB Date: Mon, 24 Oct 2022 13:27:10 +0200 Message-Id: <20221024113024.012872639@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574183710510695?= X-GMAIL-MSGID: =?utf-8?q?1747574183710510695?= From: Helge Deller commit aca7c13d3bee81a968337a5515411409ae9d095d upstream. Independend of the current graphics resolution, adjust the reported graphics card memory size to the next 4MB boundary. This fixes the fbtest program which expects a naturally aligned size. Signed-off-by: Helge Deller Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/stifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1257,7 +1257,7 @@ static int __init stifb_init_fb(struct s /* limit fbsize to max visible screen size */ if (fix->smem_len > yres*fix->line_length) - fix->smem_len = yres*fix->line_length; + fix->smem_len = ALIGN(yres*fix->line_length, 4*1024*1024); fix->accel = FB_ACCEL_NONE;