5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
233 lines
5.2 KiB
C
233 lines
5.2 KiB
C
/*
|
|
* linux/drivers/video/savage/savagefb-i2c.c - S3 Savage DDC2
|
|
*
|
|
* Copyright 2004 Antonino A. Daplas <adaplas @pol.net>
|
|
*
|
|
* Based partly on rivafb-i2c.c
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/fb.h>
|
|
|
|
#include <asm/io.h>
|
|
#include "savagefb.h"
|
|
|
|
#define SAVAGE_DDC 0x50
|
|
|
|
#define VGA_CR_IX 0x3d4
|
|
#define VGA_CR_DATA 0x3d5
|
|
|
|
#define CR_SERIAL1 0xa0 /* I2C serial communications interface */
|
|
#define MM_SERIAL1 0xff20
|
|
#define CR_SERIAL2 0xb1 /* DDC2 monitor communications interface */
|
|
|
|
/* based on vt8365 documentation */
|
|
#define PROSAVAGE_I2C_ENAB 0x10
|
|
#define PROSAVAGE_I2C_SCL_OUT 0x01
|
|
#define PROSAVAGE_I2C_SDA_OUT 0x02
|
|
#define PROSAVAGE_I2C_SCL_IN 0x04
|
|
#define PROSAVAGE_I2C_SDA_IN 0x08
|
|
|
|
#define SAVAGE4_I2C_ENAB 0x00000020
|
|
#define SAVAGE4_I2C_SCL_OUT 0x00000001
|
|
#define SAVAGE4_I2C_SDA_OUT 0x00000002
|
|
#define SAVAGE4_I2C_SCL_IN 0x00000008
|
|
#define SAVAGE4_I2C_SDA_IN 0x00000010
|
|
|
|
static void savage4_gpio_setscl(void *data, int val)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
unsigned int r;
|
|
|
|
r = readl(chan->ioaddr + chan->reg);
|
|
if(val)
|
|
r |= SAVAGE4_I2C_SCL_OUT;
|
|
else
|
|
r &= ~SAVAGE4_I2C_SCL_OUT;
|
|
writel(r, chan->ioaddr + chan->reg);
|
|
readl(chan->ioaddr + chan->reg); /* flush posted write */
|
|
}
|
|
|
|
static void savage4_gpio_setsda(void *data, int val)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
|
|
unsigned int r;
|
|
r = readl(chan->ioaddr + chan->reg);
|
|
if(val)
|
|
r |= SAVAGE4_I2C_SDA_OUT;
|
|
else
|
|
r &= ~SAVAGE4_I2C_SDA_OUT;
|
|
writel(r, chan->ioaddr + chan->reg);
|
|
readl(chan->ioaddr + chan->reg); /* flush posted write */
|
|
}
|
|
|
|
static int savage4_gpio_getscl(void *data)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
|
|
return (0 != (readl(chan->ioaddr + chan->reg) & SAVAGE4_I2C_SCL_IN));
|
|
}
|
|
|
|
static int savage4_gpio_getsda(void *data)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
|
|
return (0 != (readl(chan->ioaddr + chan->reg) & SAVAGE4_I2C_SDA_IN));
|
|
}
|
|
|
|
static void prosavage_gpio_setscl(void* data, int val)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
u32 r;
|
|
|
|
r = VGArCR(chan->reg, chan->par);
|
|
r |= PROSAVAGE_I2C_ENAB;
|
|
if (val) {
|
|
r |= PROSAVAGE_I2C_SCL_OUT;
|
|
} else {
|
|
r &= ~PROSAVAGE_I2C_SCL_OUT;
|
|
}
|
|
|
|
VGAwCR(chan->reg, r, chan->par);
|
|
}
|
|
|
|
static void prosavage_gpio_setsda(void* data, int val)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
unsigned int r;
|
|
|
|
r = VGArCR(chan->reg, chan->par);
|
|
r |= PROSAVAGE_I2C_ENAB;
|
|
if (val) {
|
|
r |= PROSAVAGE_I2C_SDA_OUT;
|
|
} else {
|
|
r &= ~PROSAVAGE_I2C_SDA_OUT;
|
|
}
|
|
|
|
VGAwCR(chan->reg, r, chan->par);
|
|
}
|
|
|
|
static int prosavage_gpio_getscl(void* data)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
|
|
return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SCL_IN) ? 1 : 0;
|
|
}
|
|
|
|
static int prosavage_gpio_getsda(void* data)
|
|
{
|
|
struct savagefb_i2c_chan *chan = data;
|
|
|
|
return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SDA_IN) ? 1 : 0;
|
|
}
|
|
|
|
static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
|
|
const char *name)
|
|
{
|
|
int rc = 0;
|
|
|
|
if (chan->par) {
|
|
strcpy(chan->adapter.name, name);
|
|
chan->adapter.owner = THIS_MODULE;
|
|
chan->adapter.algo_data = &chan->algo;
|
|
chan->adapter.dev.parent = &chan->par->pcidev->dev;
|
|
chan->algo.udelay = 10;
|
|
chan->algo.timeout = 20;
|
|
chan->algo.data = chan;
|
|
|
|
i2c_set_adapdata(&chan->adapter, chan);
|
|
|
|
/* Raise SCL and SDA */
|
|
chan->algo.setsda(chan, 1);
|
|
chan->algo.setscl(chan, 1);
|
|
udelay(20);
|
|
|
|
rc = i2c_bit_add_bus(&chan->adapter);
|
|
|
|
if (rc == 0)
|
|
dev_dbg(&chan->par->pcidev->dev,
|
|
"I2C bus %s registered.\n", name);
|
|
else
|
|
dev_warn(&chan->par->pcidev->dev,
|
|
"Failed to register I2C bus %s.\n", name);
|
|
} else
|
|
chan->par = NULL;
|
|
|
|
return rc;
|
|
}
|
|
|
|
void savagefb_create_i2c_busses(struct fb_info *info)
|
|
{
|
|
struct savagefb_par *par = info->par;
|
|
par->chan.par = par;
|
|
|
|
switch(info->fix.accel) {
|
|
case FB_ACCEL_PROSAVAGE_DDRK:
|
|
case FB_ACCEL_PROSAVAGE_PM:
|
|
par->chan.reg = CR_SERIAL2;
|
|
par->chan.ioaddr = par->mmio.vbase;
|
|
par->chan.algo.setsda = prosavage_gpio_setsda;
|
|
par->chan.algo.setscl = prosavage_gpio_setscl;
|
|
par->chan.algo.getsda = prosavage_gpio_getsda;
|
|
par->chan.algo.getscl = prosavage_gpio_getscl;
|
|
break;
|
|
case FB_ACCEL_SAVAGE4:
|
|
case FB_ACCEL_SAVAGE2000:
|
|
par->chan.reg = 0xff20;
|
|
par->chan.ioaddr = par->mmio.vbase;
|
|
par->chan.algo.setsda = savage4_gpio_setsda;
|
|
par->chan.algo.setscl = savage4_gpio_setscl;
|
|
par->chan.algo.getsda = savage4_gpio_getsda;
|
|
par->chan.algo.getscl = savage4_gpio_getscl;
|
|
break;
|
|
default:
|
|
par->chan.par = NULL;
|
|
}
|
|
|
|
savage_setup_i2c_bus(&par->chan, "SAVAGE DDC2");
|
|
}
|
|
|
|
void savagefb_delete_i2c_busses(struct fb_info *info)
|
|
{
|
|
struct savagefb_par *par = info->par;
|
|
|
|
if (par->chan.par)
|
|
i2c_del_adapter(&par->chan.adapter);
|
|
|
|
par->chan.par = NULL;
|
|
}
|
|
|
|
int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
|
|
{
|
|
struct savagefb_par *par = info->par;
|
|
u8 *edid;
|
|
|
|
if (par->chan.par)
|
|
edid = fb_ddc_read(&par->chan.adapter);
|
|
else
|
|
edid = NULL;
|
|
|
|
if (!edid) {
|
|
/* try to get from firmware */
|
|
const u8 *e = fb_firmware_edid(info->device);
|
|
|
|
if (e)
|
|
edid = kmemdup(e, EDID_LENGTH, GFP_KERNEL);
|
|
}
|
|
|
|
*out_edid = edid;
|
|
|
|
return (edid) ? 0 : 1;
|
|
}
|
|
|
|
MODULE_LICENSE("GPL");
|