From patchwork Sat Oct 22 07:18:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1088587wrr; Sat, 22 Oct 2022 00:40:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM51os+wYQkgbEeZkmjzifJei+oRpVxWrcWz4xBkAGRdg2qMt8ZSSNM8s7QHwKQOnuCBW9VA X-Received: by 2002:a05:6a00:198f:b0:56b:95aa:3952 with SMTP id d15-20020a056a00198f00b0056b95aa3952mr394282pfl.20.1666424435774; Sat, 22 Oct 2022 00:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666424435; cv=none; d=google.com; s=arc-20160816; b=xaI+FmnsJBU2AO57ZEf4OWNanMiURPBL3qWK5aEi/8BVf1mwHwWK7/2H54QwW2GBZS mCI231QI0s6K/Y09gzUn2tDUrH1upx5an0qn9yNvFmhmMY+LVQ0cPQZWUUFuOihWV93h dzi0PLFtdur+p7WHKmaMslVFjfxjpfX6e6S7MIw5Q790NJiDWVu2BEPW0mo/BWEB2Ftc e4ZkOhK/ku1cnX5HMGzryThdIB8IgsWcFvYcs07sB+vifRc3/eBgrf8EVwis+PawSSSd xsCE2Ka8RZlQXDP9QKVTtv511wXDWyQ5Qq08OMcnxD2DcpM3s3ojH6uL1K5MN+oM37Qw GJwA== 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=hBOXftv2TRYcUUsb8yOfh9Dw6hTrr1Ks6JvwCRYYDtY=; b=svW0L6/V0aUWWC0letHevdjvwN58f+qF3ALgGZm85VmxdCqwcrZLPjlP/cIBryrQMN cvK7q9d2PZuoIONgpcDOuq7AaQrp+FwwVImC7/tgdk+ohA/HheThsLvuCa8VSAh3OdNw rvVQnAoYd066GmycYa5wyRHcRw+e+vWv5dDzC3apmEvnIryh7p++R9+DBxpuuuv8MoO/ Tyi+v6l6PnU/iGDNyq3oGG+wB/YP7H6kvattBXhoW30HWO2hh0Xj3Fo+60DbUm63PmXo 6orVPEn+g2ztXVAJg0vhVbrQdSj3HoS1ljfRgaKBmC9ZO9T/u/KKHuIwbL9XQ8/TTQhk gTUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vMvNaCRY; 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 z13-20020a170902cccd00b0018659ff71d2si10261833ple.62.2022.10.22.00.40.23; Sat, 22 Oct 2022 00:40: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=vMvNaCRY; 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 S231161AbiJVHj6 (ORCPT + 99 others); Sat, 22 Oct 2022 03:39:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230520AbiJVHjH (ORCPT ); Sat, 22 Oct 2022 03:39:07 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED17C2ACBF3; Sat, 22 Oct 2022 00:36:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id 55A2EB82DEF; Sat, 22 Oct 2022 07:36:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BBDDC433D6; Sat, 22 Oct 2022 07:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424183; bh=FP0+Py/xiye3Lrwe1PTtluLDiVfZV2Fz/lWJUEeXaKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vMvNaCRYxvhVP0ebP7WeIT5eHxaGCpTZhQTaIFdBBLmUj5nWdYfBNmv5mdZ51ToIC xYHfFx2Bz+jNfFKeSuxM77BLXaHRldaQ0/03qpiBLiiZwb21RsvMguD+bcSIsk8yGi oCVkJR9ObZg1VY4tRHp//Sc0F6P70g64v+sK4xBA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.19 053/717] parisc: fbdev/stifb: Align graphics memory size to 4MB Date: Sat, 22 Oct 2022 09:18:52 +0200 Message-Id: <20221022072424.461422399@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747372669119385969?= X-GMAIL-MSGID: =?utf-8?q?1747372669119385969?= 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 @@ -1298,7 +1298,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;