31de59d5e1
The main motivation of this patch was to merge the three initialization functions in one and clean it up. However as some changes in other code areas where needed to do it right some small other changes were made. Changes to viafb_par: io_virt renamed as engine_mmio and moved to shared VQ_start renamed as vq_vram_addr and moved to shared VQ_end removed as it is easily recalculatable vq_vram_addr is not strictly needed but keep it to track where we allocated video memory. The memory allocated for the virtual queue was shrunk to VQ_SIZE as VQ_SIZE+CURSOR_SIZE looked like a bug to me. But to be honest I don't have the faintest idea what virtual queues are for in the graphic hardware and whether the driver needs them in any way. I only know that they aren't directly accessed by the driver and so the only potential current use would be as hardware internal buffers. For now keep them to avoid regressions and only remove the double cursor allocation. The most changes were caused by renames and the mentioned structure changes so the chance of regressions is pretty low. The meaning of viafb_accel changed slightly as previously it was changed back and forth in the code and allowed to enable the hardware acceleration by software if previously disabled. The new behaviour is that viafb_accel=0 always prevents hardware acceleration. With viafb_accel!=0 the acceleration can be freely choosen by set_var. This means viafb_accel is a diagnostic tool and if someone has to use viafb_accel=0 the driver needs to be fixed. As this is mostly a code cleanup no regressions beside the slightly change of viafb_accel is expected. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Scott Fang <ScottFang@viatech.com.cn> Cc: Joseph Chan <JosephChan@via.com.tw> Cc: Harald Welte <laforge@gnumonks.org> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/*
|
|
* Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
|
|
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public
|
|
* License as published by the Free Software Foundation;
|
|
* either version 2, or (at your option) any later version.
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
* A PARTICULAR PURPOSE.See the GNU General Public License
|
|
* for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc.,
|
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
#include "global.h"
|
|
int viafb_platform_epia_dvi = STATE_OFF;
|
|
int viafb_device_lcd_dualedge = STATE_OFF;
|
|
int viafb_bus_width = 12;
|
|
int viafb_display_hardware_layout = HW_LAYOUT_LCD_DVI;
|
|
int viafb_memsize;
|
|
int viafb_DeviceStatus = CRT_Device;
|
|
int viafb_hotplug;
|
|
int viafb_refresh = 60;
|
|
int viafb_refresh1 = 60;
|
|
int viafb_lcd_dsp_method = LCD_EXPANDSION;
|
|
int viafb_lcd_mode = LCD_OPENLDI;
|
|
int viafb_bpp = 32;
|
|
int viafb_bpp1 = 32;
|
|
int viafb_CRT_ON = 1;
|
|
int viafb_DVI_ON;
|
|
int viafb_LCD_ON ;
|
|
int viafb_LCD2_ON;
|
|
int viafb_SAMM_ON;
|
|
int viafb_dual_fb;
|
|
int viafb_hotplug_Xres = 640;
|
|
int viafb_hotplug_Yres = 480;
|
|
int viafb_hotplug_bpp = 32;
|
|
int viafb_hotplug_refresh = 60;
|
|
unsigned int viafb_second_offset;
|
|
int viafb_second_size;
|
|
int viafb_primary_dev = None_Device;
|
|
unsigned int viafb_second_xres = 640;
|
|
unsigned int viafb_second_yres = 480;
|
|
unsigned int viafb_second_virtual_xres;
|
|
unsigned int viafb_second_virtual_yres;
|
|
int viafb_lcd_panel_id = LCD_PANEL_ID_MAXIMUM + 1;
|
|
struct fb_info *viafbinfo;
|
|
struct fb_info *viafbinfo1;
|
|
struct viafb_par *viaparinfo;
|
|
struct viafb_par *viaparinfo1;
|
|
|