mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
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>
108 lines
3.5 KiB
C
108 lines
3.5 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.
|
|
*/
|
|
|
|
#ifndef __VIAFBDEV_H__
|
|
#define __VIAFBDEV_H__
|
|
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/fb.h>
|
|
|
|
#include "ioctl.h"
|
|
#include "share.h"
|
|
#include "chip.h"
|
|
#include "hw.h"
|
|
#include "via_i2c.h"
|
|
|
|
#define VERSION_MAJOR 2
|
|
#define VERSION_KERNEL 6 /* For kernel 2.6 */
|
|
|
|
#define VERSION_OS 0 /* 0: for 32 bits OS, 1: for 64 bits OS */
|
|
#define VERSION_MINOR 4
|
|
|
|
struct viafb_shared {
|
|
struct proc_dir_entry *proc_entry; /*viafb proc entry */
|
|
|
|
/* I2C stuff */
|
|
struct via_i2c_stuff i2c_stuff;
|
|
|
|
/* All the information will be needed to set engine */
|
|
struct tmds_setting_information tmds_setting_info;
|
|
struct crt_setting_information crt_setting_info;
|
|
struct lvds_setting_information lvds_setting_info;
|
|
struct lvds_setting_information lvds_setting_info2;
|
|
struct chip_information chip_info;
|
|
|
|
/* hardware acceleration stuff */
|
|
void __iomem *engine_mmio;
|
|
u32 cursor_vram_addr;
|
|
u32 vq_vram_addr; /* virtual queue address in video ram */
|
|
int (*hw_bitblt)(void __iomem *engine, u8 op, u32 width, u32 height,
|
|
u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y,
|
|
u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
|
|
u32 fg_color, u32 bg_color, u8 fill_rop);
|
|
};
|
|
|
|
struct viafb_par {
|
|
u8 depth;
|
|
u32 vram_addr;
|
|
|
|
unsigned int fbmem; /*framebuffer physical memory address */
|
|
unsigned int memsize; /*size of fbmem */
|
|
u32 fbmem_free; /* Free FB memory */
|
|
u32 fbmem_used; /* Use FB memory size */
|
|
u32 iga_path;
|
|
|
|
struct viafb_shared *shared;
|
|
|
|
/* All the information will be needed to set engine */
|
|
/* depreciated, use the ones in shared directly */
|
|
struct tmds_setting_information *tmds_setting_info;
|
|
struct crt_setting_information *crt_setting_info;
|
|
struct lvds_setting_information *lvds_setting_info;
|
|
struct lvds_setting_information *lvds_setting_info2;
|
|
struct chip_information *chip_info;
|
|
};
|
|
|
|
extern unsigned int viafb_second_virtual_yres;
|
|
extern unsigned int viafb_second_virtual_xres;
|
|
extern unsigned int viafb_second_offset;
|
|
extern int viafb_second_size;
|
|
extern int viafb_SAMM_ON;
|
|
extern int viafb_dual_fb;
|
|
extern int viafb_LCD2_ON;
|
|
extern int viafb_LCD_ON;
|
|
extern int viafb_DVI_ON;
|
|
extern int viafb_hotplug;
|
|
extern int viafb_memsize;
|
|
|
|
extern int strict_strtoul(const char *cp, unsigned int base,
|
|
unsigned long *res);
|
|
|
|
void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
|
|
int mode_index);
|
|
int viafb_get_mode_index(int hres, int vres);
|
|
u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
|
|
*plvds_setting_info, struct lvds_chip_information
|
|
*plvds_chip_info, u8 index);
|
|
void viafb_gpio_i2c_write_mask_lvds(struct lvds_setting_information
|
|
*plvds_setting_info, struct lvds_chip_information
|
|
*plvds_chip_info, struct IODATA io_data);
|
|
#endif /* __VIAFBDEV_H__ */
|