2006-10-03 16:14:42 +08:00
|
|
|
/*
|
|
|
|
|
* driver/vide/fb_ddc.c - DDC/EDID read support.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2006 Dennis Munsie <dmunsie@cecropia.com>
|
|
|
|
|
*
|
|
|
|
|
* 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/delay.h>
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
|
#include <linux/fb.h>
|
|
|
|
|
#include <linux/i2c-algo-bit.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
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>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2006-10-03 16:14:42 +08:00
|
|
|
|
|
|
|
|
#include "edid.h"
|
|
|
|
|
|
|
|
|
|
#define DDC_ADDR 0x50
|
|
|
|
|
|
|
|
|
|
static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
|
|
|
|
|
{
|
|
|
|
|
unsigned char start = 0x0;
|
2006-11-17 14:18:28 +08:00
|
|
|
unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
|
2006-10-03 16:14:42 +08:00
|
|
|
struct i2c_msg msgs[] = {
|
|
|
|
|
{
|
|
|
|
|
.addr = DDC_ADDR,
|
2006-11-17 14:18:28 +08:00
|
|
|
.flags = 0,
|
2006-10-03 16:14:42 +08:00
|
|
|
.len = 1,
|
|
|
|
|
.buf = &start,
|
|
|
|
|
}, {
|
|
|
|
|
.addr = DDC_ADDR,
|
|
|
|
|
.flags = I2C_M_RD,
|
|
|
|
|
.len = EDID_LENGTH,
|
2006-11-17 14:18:28 +08:00
|
|
|
.buf = buf,
|
2006-10-03 16:14:42 +08:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (!buf) {
|
|
|
|
|
dev_warn(&adapter->dev, "unable to allocate memory for EDID "
|
|
|
|
|
"block.\n");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i2c_transfer(adapter, msgs, 2) == 2)
|
|
|
|
|
return buf;
|
|
|
|
|
|
|
|
|
|
dev_warn(&adapter->dev, "unable to read EDID block.\n");
|
|
|
|
|
kfree(buf);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_algo_bit_data *algo_data = adapter->algo_data;
|
|
|
|
|
unsigned char *edid = NULL;
|
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
|
|
algo_data->setscl(algo_data->data, 1);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
|
/* For some old monitors we need the
|
|
|
|
|
* following process to initialize/stop DDC
|
|
|
|
|
*/
|
fb_ddc: fix DDC lines quirk
The code in fb_ddc_read() is said to be based on the implementation of the
radeon driver:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=fc5891c8a3ba284f13994d7bc1f1bfa8283982de
However, comparing the old radeon driver code with the new fb_ddc code
reveals some differences. Most notably, the I2C bus lines are held at the
end of the function, while the original code was releasing them (as the
comment above correctly says.)
There are a few other differences, which appear to be responsible for read
failures on my system. While tracing low-level I2C code in i2c-algo-bit, I
noticed that the initial attempt to read the EDID always failed. It takes
one retry for the read to succeed. As we are about to remove this
automatic retry property from i2c-algo-bit, reading the EDID would really
fail.
As a summary, the I2C lines quirk which is supposedly needed to read EDID
on some older monitors is currently breaking the (first) read on all other
monitors (and might not even work with older ones - did anyone try since
October 2006?)
After applying the patch below, which makes the code in fb_ddc_read()
really similar to what the radeon driver used to have, the first EDID read
succeeds again.
On top of that, as it appears that this code has been broken for one year
now and nobody seems to have complained, I'm curious if it makes sense to
keep this quirk in place. It makes the code more complex and slower just
for the sake of monitors which I guess nobody uses anymore. Can't we just
get rid of it?
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Roger Leigh <rleigh@whinlatter.ukfsn.org>
Tested-by: Michael Buesch <mb@bu3sch.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-11-29 08:21:35 +08:00
|
|
|
algo_data->setsda(algo_data->data, 1);
|
2006-10-03 16:14:42 +08:00
|
|
|
msleep(13);
|
|
|
|
|
|
|
|
|
|
algo_data->setscl(algo_data->data, 1);
|
|
|
|
|
for (j = 0; j < 5; j++) {
|
|
|
|
|
msleep(10);
|
|
|
|
|
if (algo_data->getscl(algo_data->data))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (j == 5)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
algo_data->setsda(algo_data->data, 0);
|
|
|
|
|
msleep(15);
|
|
|
|
|
algo_data->setscl(algo_data->data, 0);
|
|
|
|
|
msleep(15);
|
|
|
|
|
algo_data->setsda(algo_data->data, 1);
|
|
|
|
|
msleep(15);
|
|
|
|
|
|
|
|
|
|
/* Do the real work */
|
|
|
|
|
edid = fb_do_probe_ddc_edid(adapter);
|
|
|
|
|
algo_data->setsda(algo_data->data, 0);
|
|
|
|
|
algo_data->setscl(algo_data->data, 0);
|
|
|
|
|
msleep(15);
|
|
|
|
|
|
|
|
|
|
algo_data->setscl(algo_data->data, 1);
|
|
|
|
|
for (j = 0; j < 10; j++) {
|
|
|
|
|
msleep(10);
|
|
|
|
|
if (algo_data->getscl(algo_data->data))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
algo_data->setsda(algo_data->data, 1);
|
|
|
|
|
msleep(15);
|
|
|
|
|
algo_data->setscl(algo_data->data, 0);
|
fb_ddc: fix DDC lines quirk
The code in fb_ddc_read() is said to be based on the implementation of the
radeon driver:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=fc5891c8a3ba284f13994d7bc1f1bfa8283982de
However, comparing the old radeon driver code with the new fb_ddc code
reveals some differences. Most notably, the I2C bus lines are held at the
end of the function, while the original code was releasing them (as the
comment above correctly says.)
There are a few other differences, which appear to be responsible for read
failures on my system. While tracing low-level I2C code in i2c-algo-bit, I
noticed that the initial attempt to read the EDID always failed. It takes
one retry for the read to succeed. As we are about to remove this
automatic retry property from i2c-algo-bit, reading the EDID would really
fail.
As a summary, the I2C lines quirk which is supposedly needed to read EDID
on some older monitors is currently breaking the (first) read on all other
monitors (and might not even work with older ones - did anyone try since
October 2006?)
After applying the patch below, which makes the code in fb_ddc_read()
really similar to what the radeon driver used to have, the first EDID read
succeeds again.
On top of that, as it appears that this code has been broken for one year
now and nobody seems to have complained, I'm curious if it makes sense to
keep this quirk in place. It makes the code more complex and slower just
for the sake of monitors which I guess nobody uses anymore. Can't we just
get rid of it?
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Roger Leigh <rleigh@whinlatter.ukfsn.org>
Tested-by: Michael Buesch <mb@bu3sch.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-11-29 08:21:35 +08:00
|
|
|
algo_data->setsda(algo_data->data, 0);
|
2006-10-03 16:14:42 +08:00
|
|
|
if (edid)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Release the DDC lines when done or the Apple Cinema HD display
|
|
|
|
|
* will switch off
|
|
|
|
|
*/
|
fb_ddc: fix DDC lines quirk
The code in fb_ddc_read() is said to be based on the implementation of the
radeon driver:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=fc5891c8a3ba284f13994d7bc1f1bfa8283982de
However, comparing the old radeon driver code with the new fb_ddc code
reveals some differences. Most notably, the I2C bus lines are held at the
end of the function, while the original code was releasing them (as the
comment above correctly says.)
There are a few other differences, which appear to be responsible for read
failures on my system. While tracing low-level I2C code in i2c-algo-bit, I
noticed that the initial attempt to read the EDID always failed. It takes
one retry for the read to succeed. As we are about to remove this
automatic retry property from i2c-algo-bit, reading the EDID would really
fail.
As a summary, the I2C lines quirk which is supposedly needed to read EDID
on some older monitors is currently breaking the (first) read on all other
monitors (and might not even work with older ones - did anyone try since
October 2006?)
After applying the patch below, which makes the code in fb_ddc_read()
really similar to what the radeon driver used to have, the first EDID read
succeeds again.
On top of that, as it appears that this code has been broken for one year
now and nobody seems to have complained, I'm curious if it makes sense to
keep this quirk in place. It makes the code more complex and slower just
for the sake of monitors which I guess nobody uses anymore. Can't we just
get rid of it?
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Roger Leigh <rleigh@whinlatter.ukfsn.org>
Tested-by: Michael Buesch <mb@bu3sch.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-11-29 08:21:35 +08:00
|
|
|
algo_data->setsda(algo_data->data, 1);
|
|
|
|
|
algo_data->setscl(algo_data->data, 1);
|
2006-10-03 16:14:42 +08:00
|
|
|
|
2008-07-15 04:38:28 +08:00
|
|
|
adapter->class |= I2C_CLASS_DDC;
|
2006-10-03 16:14:42 +08:00
|
|
|
return edid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(fb_ddc_read);
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Dennis Munsie <dmunsie@cecropia.com>");
|
|
|
|
|
MODULE_DESCRIPTION("DDC/EDID reading support");
|
|
|
|
|
MODULE_LICENSE("GPL");
|