[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
AuthorDate: Thu, 9 Jul 2015 18:24:56 -0700
Committer: Ingo Molnar
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
Signed-off-by: Borislav Petkov
Cc: H. Peter Anvin
Cc: Jean-Christophe Plagniol-Villard
Cc: Linus Torvalds
Cc: Mathias Krause
Cc: Peter Zijlstra
Cc: Thomas Gleixner
Cc: Tomi Valkeinen
Cc: airl...@redhat.com
Cc: a...@arndb.de
Cc: b...@kernel.crashing.org
Cc: dan.j.willi...@intel.com
Cc: ge...@linux-m68k.org
Cc: h...@lst.de
Cc: h...@hmh.eng.br
Cc: jgr...@suse.com
Cc: linux-fb...@vger.kernel.org
Cc: linux...@kvack.org
Cc: l...@amacapital.net
Cc: m...@ellerman.id.au
Cc: m...@redhat.com
Cc: r...@linux-mips.org
Cc: ross.zwis...@linux.intel.com
Cc: stefan.ba...@canonical.com
Cc: syrj...@sci.fi
Cc: t...@kernel.org
Cc: toshi.k...@hp.com
Cc: ville.syrj...@linux.intel.com
Link:
http://lkml.kernel.org/r/1435251019-32421-1-git-send-email-mcg...@do-not-panic.com
Link:
http://lkml.kernel.org/r/1436491499-3289-2-git-send-email-mcg...@do-not-panic.com
Signed-off-by: Ingo Molnar
---
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 == 0x80 ||
+(par->bus_type == ISA && info->fix.smem_len == 0x40)))
+ 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, >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 == 0x80 ||
-(par->bus_type == ISA && info->fix.smem_len == 0x40)))
- 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[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 mcg...@suse.com
AuthorDate: Thu, 9 Jul 2015 18:24:56 -0700
Committer: Ingo Molnar mi...@kernel.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 mcg...@suse.com
Signed-off-by: Borislav Petkov b...@suse.de
Cc: H. Peter Anvin h...@zytor.com
Cc: Jean-Christophe Plagniol-Villard plagn...@jcrosoft.com
Cc: Linus Torvalds torva...@linux-foundation.org
Cc: Mathias Krause mini...@googlemail.com
Cc: Peter Zijlstra pet...@infradead.org
Cc: Thomas Gleixner t...@linutronix.de
Cc: Tomi Valkeinen tomi.valkei...@ti.com
Cc: airl...@redhat.com
Cc: a...@arndb.de
Cc: b...@kernel.crashing.org
Cc: dan.j.willi...@intel.com
Cc: ge...@linux-m68k.org
Cc: h...@lst.de
Cc: h...@hmh.eng.br
Cc: jgr...@suse.com
Cc: linux-fb...@vger.kernel.org
Cc: linux...@kvack.org
Cc: l...@amacapital.net
Cc: m...@ellerman.id.au
Cc: m...@redhat.com
Cc: r...@linux-mips.org
Cc: ross.zwis...@linux.intel.com
Cc: stefan.ba...@canonical.com
Cc: syrj...@sci.fi
Cc: t...@kernel.org
Cc: toshi.k...@hp.com
Cc: ville.syrj...@linux.intel.com
Link:
http://lkml.kernel.org/r/1435251019-32421-1-git-send-email-mcg...@do-not-panic.com
Link:
http://lkml.kernel.org/r/1436491499-3289-2-git-send-email-mcg...@do-not-panic.com
Signed-off-by: Ingo Molnar mi...@kernel.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 == 0x80 ||
+(par-bus_type == ISA info-fix.smem_len == 0x40)))
+ 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 == 0x80 ||
-(par-bus_type == ISA info-fix.smem_len == 0x40)))
- 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
