From patchwork Tue Jan 11 23:50:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 472691 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0BNo59C007680 for ; Tue, 11 Jan 2011 23:50:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932637Ab1AKXuF (ORCPT ); Tue, 11 Jan 2011 18:50:05 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:50504 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932576Ab1AKXuE (ORCPT ); Tue, 11 Jan 2011 18:50:04 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 0994924C088; Tue, 11 Jan 2011 15:50:37 -0800 (PST) Date: Tue, 11 Jan 2011 15:50:36 -0800 (PST) Message-Id: <20110111.155036.191158491.davem@davemloft.net> To: linux-fbdev@vger.kernel.org CC: sparclinux@vger.kernel.org, alex.buell@munted.org.uk Subject: [PATCH 6/22] svga: Make svga_set_default_atc_regs take an iomem regbase pointer. From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 11 Jan 2011 23:50:06 +0000 (UTC) diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 7939d5e..2dfecbf 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c @@ -654,7 +654,7 @@ static int arkfb_set_par(struct fb_info *info) /* Set default values */ svga_set_default_gfx_regs(par->state.vgabase); - svga_set_default_atc_regs(); + svga_set_default_atc_regs(par->state.vgabase); svga_set_default_seq_regs(); svga_set_default_crt_regs(); svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF); diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index 773650c..a187376 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c @@ -515,7 +515,7 @@ static int s3fb_set_par(struct fb_info *info) /* Set default values */ svga_set_default_gfx_regs(par->state.vgabase); - svga_set_default_atc_regs(); + svga_set_default_atc_regs(par->state.vgabase); svga_set_default_seq_regs(); svga_set_default_crt_regs(); svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF); diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index 25f9f87..8b97359 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c @@ -93,26 +93,26 @@ void svga_set_default_gfx_regs(void __iomem *regbase) } /* Set attribute controller registers to sane values */ -void svga_set_default_atc_regs(void) +void svga_set_default_atc_regs(void __iomem *regbase) { u8 count; - vga_r(NULL, 0x3DA); - vga_w(NULL, VGA_ATT_W, 0x00); + vga_r(regbase, 0x3DA); + vga_w(regbase, VGA_ATT_W, 0x00); /* All standard ATC registers (AR00 - AR14) */ for (count = 0; count <= 0xF; count ++) - svga_wattr(NULL, count, count); + svga_wattr(regbase, count, count); - svga_wattr(NULL, VGA_ATC_MODE, 0x01); -/* svga_wattr(NULL, VGA_ATC_MODE, 0x41); */ - svga_wattr(NULL, VGA_ATC_OVERSCAN, 0x00); - svga_wattr(NULL, VGA_ATC_PLANE_ENABLE, 0x0F); - svga_wattr(NULL, VGA_ATC_PEL, 0x00); - svga_wattr(NULL, VGA_ATC_COLOR_PAGE, 0x00); + svga_wattr(regbase, VGA_ATC_MODE, 0x01); +/* svga_wattr(regbase, VGA_ATC_MODE, 0x41); */ + svga_wattr(regbase, VGA_ATC_OVERSCAN, 0x00); + svga_wattr(regbase, VGA_ATC_PLANE_ENABLE, 0x0F); + svga_wattr(regbase, VGA_ATC_PEL, 0x00); + svga_wattr(regbase, VGA_ATC_COLOR_PAGE, 0x00); - vga_r(NULL, 0x3DA); - vga_w(NULL, VGA_ATT_W, 0x20); + vga_r(regbase, 0x3DA); + vga_w(regbase, VGA_ATT_W, 0x20); } /* Set sequencer registers to sane values */ diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 77382e9..24f5b43 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c @@ -426,7 +426,7 @@ static int vt8623fb_set_par(struct fb_info *info) /* Set default values */ svga_set_default_gfx_regs(par->state.vgabase); - svga_set_default_atc_regs(); + svga_set_default_atc_regs(par->state.vgabase); svga_set_default_seq_regs(); svga_set_default_crt_regs(); svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF); diff --git a/include/linux/svga.h b/include/linux/svga.h index 4591032..87a4164 100644 --- a/include/linux/svga.h +++ b/include/linux/svga.h @@ -100,7 +100,7 @@ void svga_wcrt_multi(void __iomem *regbase, const struct vga_regset *regset, u32 void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 value); void svga_set_default_gfx_regs(void __iomem *regbase); -void svga_set_default_atc_regs(void); +void svga_set_default_atc_regs(void __iomem *regbase); void svga_set_default_seq_regs(void); void svga_set_default_crt_regs(void); void svga_set_textmode_vga_regs(void);