From: Florian Tobias Schandinat on
Hi Jon,

I fear your analysis that the #ifdef's are not needed is wrong. At least
with this patch applied I get:

drivers/video/via/hw.c: In function 'init_tmds_chip_info':
drivers/video/via/hw.c:2043: error: implicit declaration of function
'machine_is_olpc'

drivers/video/via/lcd.c: In function 'viafb_lvds_trasmitter_identify':
drivers/video/via/lcd.c:179: error: implicit declaration of function
'machine_is_olpc'

So I vote for taking the original patch but in the series that also adds
the relevant config option.


Thanks,

Florian Tobias Schandinat

Jonathan Corbet schrieb:
> From: Chris Ball <cjb(a)laptop.org>
>
> The i2c transactions involved in detecting LVDS (9 seconds) and TMDS
> (16 seconds) add an extra 25 seconds to viafb load time on the XO-1.5.
>
> [jc: minor merge conflict fixed, removed ifdefs]
> Signed-off-by: Chris Ball <cjb(a)laptop.org>
> ---
> drivers/video/via/hw.c | 7 +++++++
> drivers/video/via/lcd.c | 7 +++++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
> index 4aff0f7..bd5d5ce 100644
> --- a/drivers/video/via/hw.c
> +++ b/drivers/video/via/hw.c
> @@ -2037,6 +2037,13 @@ static void init_gfx_chip_info(struct pci_dev *pdev,
>
> static void init_tmds_chip_info(void)
> {
> + /*
> + * OLPC XO 1.5 systems are wired differently, so there is
> + * no point in them here.
> + */
> + if (machine_is_olpc())
> + return;
> +
> viafb_tmds_trasmitter_identify();
>
> if (INTERFACE_NONE == viaparinfo->chip_info->tmds_chip_info.
> diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
> index b656e59..ce3f4b6 100644
> --- a/drivers/video/via/lcd.c
> +++ b/drivers/video/via/lcd.c
> @@ -173,6 +173,13 @@ static bool lvds_identify_integratedlvds(void)
>
> int viafb_lvds_trasmitter_identify(void)
> {
> + /*
> + * OLPC XO 1.5 systems are wired differently, so there is
> + * no point in them here.
> + */
> + if (machine_is_olpc())
> + return FAIL;
> +
> viaparinfo->shared->i2c_stuff.i2c_port = I2CPORTINDEX;
> if (viafb_lvds_identify_vt1636()) {
> viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jonathan Corbet on
On Fri, 23 Apr 2010 22:56:46 +0200
Florian Tobias Schandinat <FlorianSchandinat(a)gmx.de> wrote:

> I fear your analysis that the #ifdef's are not needed is wrong. At least
> with this patch applied I get:
>
> drivers/video/via/hw.c: In function 'init_tmds_chip_info':
> drivers/video/via/hw.c:2043: error: implicit declaration of function
> 'machine_is_olpc'

No, the problem is the "embarrassing compilation error" I mentioned in
my other mail; it needs "#include <asm/olpc.h>" at the top of the file.

Sorry,

jon
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/