linux-kernel - [tip:x86/mm] drivers/video/fbdev/atyfb: Carve out framebuffer length fudging into a helper

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-eacd2d542610e55cad0be445966ac8ae79124c6e@git.kernel.org>
Date:	Tue, 21 Jul 2015 02:42:53 -0700
From:	"tip-bot for Luis R. Rodriguez" <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	bp@...e.de, minipli@...glemail.com, mcgrof@...e.com,
	tomi.valkeinen@...com, plagnioj@...osoft.com,
	linux-kernel@...r.kernel.org, mingo@...nel.org, tglx@...utronix.de,
	torvalds@...ux-foundation.org, hpa@...or.com, peterz@...radead.org
Subject: [tip:x86/mm] drivers/video/fbdev/atyfb:
  Carve out framebuffer length fudging into a helper

Commit-ID:  eacd2d542610e55cad0be445966ac8ae79124c6e
Gitweb:     http://git.kernel.org/tip/eacd2d542610e55cad0be445966ac8ae79124c6e
Author:     Luis R. Rodriguez <mcgrof@...e.com>
AuthorDate: Thu, 9 Jul 2015 18:24:56 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 21 Jul 2015 10:47:04 +0200

drivers/video/fbdev/atyfb: Carve out framebuffer length fudging into a helper

The size of the framebuffer to be used needs to be fudged to
account for the different type of devices that are out there.
This captures what is required to do well, we'll reuse this
later.

This has no functional changes.

Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Mathias Krause <minipli@...glemail.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tomi Valkeinen <tomi.valkeinen@...com>
Cc: airlied@...hat.com
Cc: arnd@...db.de
Cc: benh@...nel.crashing.org
Cc: dan.j.williams@...el.com
Cc: geert@...ux-m68k.org
Cc: hch@....de
Cc: hmh@....eng.br
Cc: jgross@...e.com
Cc: linux-fbdev@...r.kernel.org
Cc: linux-mm@...ck.org
Cc: luto@...capital.net
Cc: mpe@...erman.id.au
Cc: mst@...hat.com
Cc: ralf@...ux-mips.org
Cc: ross.zwisler@...ux.intel.com
Cc: stefan.bader@...onical.com
Cc: syrjala@....fi
Cc: tj@...nel.org
Cc: toshi.kani@...com
Cc: ville.syrjala@...ux.intel.com
Link: http://lkml.kernel.org/r/1435251019-32421-1-git-send-email-mcgrof@do-not-panic.com
Link: http://lkml.kernel.org/r/1436491499-3289-2-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 drivers/video/fbdev/aty/atyfb_base.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 8789e48..16936bb 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -427,6 +427,20 @@ static struct {
 #endif /* CONFIG_FB_ATY_CT */
 };
 
+/*
+ * Last page of 8 MB (4 MB on ISA) aperture is MMIO,
+ * unless the auxiliary register aperture is used.
+ */
+static void aty_fudge_framebuffer_len(struct fb_info *info)
+{
+	struct atyfb_par *par = (struct atyfb_par *) info->par;
+
+	if (!par->aux_start &&
+	    (info->fix.smem_len == 0x800000 ||
+	     (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
+		info->fix.smem_len -= GUI_RESERVE;
+}
+
 static int correct_chipset(struct atyfb_par *par)
 {
 	u8 rev;
@@ -2603,14 +2617,7 @@ static int aty_init(struct fb_info *info)
 	if (par->pll_ops->resume_pll)
 		par->pll_ops->resume_pll(info, &par->pll);
 
-	/*
-	 * Last page of 8 MB (4 MB on ISA) aperture is MMIO,
-	 * unless the auxiliary register aperture is used.
-	 */
-	if (!par->aux_start &&
-	    (info->fix.smem_len == 0x800000 ||
-	     (par->bus_type == ISA && info->fix.smem_len == 0x400000)))
-		info->fix.smem_len -= GUI_RESERVE;
+	aty_fudge_framebuffer_len(info);
 
 	/*
 	 * Disable register access through the linear aperture
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/