> diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
> index 8454adf..6387f2b 100644
> --- a/drivers/video/nvidia/nv_i2c.c
> +++ b/drivers/video/nvidia/nv_i2c.c
> @@ -25,6 +25,8 @@
>
> #include "../edid.h"
>
> +extern int useedid;
> +
> static void nvidia_gpio_setscl(void *data, int state)
> {
> struct nvidia_i2c_chan *chan = data;
> @@ -128,6 +130,9 @@ static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
>
> void nvidia_create_i2c_busses(struct nvidia_par *par)
> {
> + if (!useedid)
> + return;
> +
> par->bus = 3;
>
> par->chan[0].par = par;
> @@ -146,6 +151,9 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
>
> void nvidia_delete_i2c_busses(struct nvidia_par *par)
> {
> + if (!useedid)
> + return;
> +
> if (par->chan[0].par)
> i2c_del_adapter(&par->chan[0].adapter);
> par->chan[0].par = NULL;
> @@ -195,6 +203,9 @@ static u8 *nvidia_do_probe_i2c_edid(struct nvidia_i2c_chan *chan)
>
> int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
> {
> + if (!useedid)
> + return -1;
> +
> struct nvidia_par *par = info->par;
> u8 *edid = NULL;
> int i;
> diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
> index 538e947..179fd67 100644
> --- a/drivers/video/nvidia/nvidia.c
> +++ b/drivers/video/nvidia/nvidia.c
> @@ -83,6 +83,9 @@ static int bpp __devinitdata = 8;
> #ifdef CONFIG_MTRR
> static int nomtrr __devinitdata = 0;
> #endif
> +#ifdef CONFIG_FB_NVIDIA_I2C
> +int useedid __devinitdata = 1;
> +#endif
>
> static char *mode_option __devinitdata = NULL;
>
> @@ -1506,6 +1509,11 @@ module_param(nomtrr, bool, 0);
> MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) "
> "(default=0)");
> #endif
> +#ifdef CONFIG_FB_NVIDIA_I2C
> +module_param(useedid, bool, 0);
> +MODULE_PARM_DESC(useedid, "Use EDID to detect video modes (0 or 1) "
> + "(default=1, use EDID)");
> +#endif
>
> MODULE_AUTHOR("Antonino Daplas");
> MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset");
>
>
>
>
> --
> Giuseppe "Oblomov" Bilotta
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at
http://www.tux.org/lkml/