Attachment 14304 Details for Bug 13722 – add ivch-dvob quirk

[patch] add ivch-dvob quirk

add-ivch-dvob-quirk.patch (text/plain), 2.50 KB, created by Hong Liu on 2008-02-13 22:34:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hong Liu

Created: 2008-02-13 22:34:14 UTC

Size: 2.50 KB

patch

obsolete

>diff --git a/src/i830.h b/src/i830.h
>index 05b0358..132f089 100644
>--- a/src/i830.h
>+++ b/src/i830.h
>@@ -840,6 +840,7 @@ extern const int I830CopyROP[16];
> #define QUIRK_IGNORE_LVDS		0x00000002
> #define QUIRK_IGNORE_MACMINI_LVDS 	0x00000004
> #define QUIRK_PIPEA_FORCE		0x00000008
>+#define QUIRK_IVCH_NEED_DVOB		0x00000010
> extern void i830_fixup_devices(ScrnInfoPtr);
> 
> #endif /* _I830_H_ */
>diff --git a/src/i830_dvo.c b/src/i830_dvo.c
>index e7342b0..81d5601 100644
>--- a/src/i830_dvo.c
>+++ b/src/i830_dvo.c
>@@ -83,7 +83,7 @@ struct _I830DVODriver i830_dvo_drivers[] =
> 	.type = I830_OUTPUT_DVO_LVDS,
> 	.modulename = "ivch",
> 	.fntablename = "ivch_methods",
>-	.dvo_reg = DVOB,
>+	.dvo_reg = DVOA,
> 	.address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
> 	.symbols = ivch_symbols
>     },
>@@ -398,6 +398,7 @@ i830_dvo_get_current_mode (xf86OutputPtr output)
> void
> i830_dvo_init(ScrnInfoPtr pScrn)
> {
>+    I830Ptr pI830 = I830PTR(pScrn);
>     I830OutputPrivatePtr intel_output;
>     int ret;
>     int i;
>@@ -431,6 +432,11 @@ i830_dvo_init(ScrnInfoPtr pScrn)
> 	ret_ptr = NULL;
> 	drv->vid_rec = LoaderSymbol(drv->fntablename);
> 
>+	if (!strcmp(drv->modulename, "ivch") &&
>+	    pI830->quirk_flag & QUIRK_IVCH_NEED_DVOB) {
>+	    drv->dvo_reg = DVOB;
>+	}
>+
> 	/* Allow the I2C driver info to specify the GPIO to be used in
> 	 * special cases, but otherwise default to what's defined in the spec.
> 	 */
>diff --git a/src/i830_quirks.c b/src/i830_quirks.c
>index 853a33e..002649b 100644
>--- a/src/i830_quirks.c
>+++ b/src/i830_quirks.c
>@@ -59,6 +59,11 @@ static void quirk_mac_mini (I830Ptr pI830)
>     pI830->quirk_flag |= QUIRK_IGNORE_MACMINI_LVDS;
> }
> 
>+static void quirk_ivch_dvob (I830Ptr pI830)
>+{
>+	pI830->quirk_flag |= QUIRK_IVCH_NEED_DVOB;
>+}
>+
> /* keep this list sorted by OEM, then by chip ID */
> static i830_quirk i830_quirk_list[] = {
>     /* Aopen mini pc */
>@@ -91,6 +96,8 @@ static i830_quirk i830_quirk_list[] = {
> 
>     /* Toshiba Satellite U300 has no TV output */
>     { PCI_CHIP_I965_GM, 0x1179, 0xff50, quirk_ignore_tv },
>+    /* Toshiba i830M laptop (fix bug 11148) */
>+    { PCI_CHIP_I830_M, 0x1179, 0xff00, quirk_ivch_dvob },
> 
>     /* Samsung Q35 has no TV output */
>     { PCI_CHIP_I945_GM, 0x144d, 0xc504, quirk_ignore_tv },
>@@ -100,6 +107,9 @@ static i830_quirk i830_quirk_list[] = {
>     /* Dell Inspiron 510m needs pipe A force quirk */
>     { PCI_CHIP_I855_GM, 0x1028, 0x0164, quirk_pipea_force },
> 
>+    /* Sony vaio PCG-r600HFP (fix bug 13722) */
>+    { PCI_CHIP_I830_M, 0x104d, 0x8100, quirk_ivch_dvob },
>+
>     { 0, 0, 0, NULL },
> };
>

Actions: View | Splinter Review

Attachments on bug 13722: 13856 | 13916 | 13984 | 13997 | 14009 | 14010 | 14032 | 14033 | 14046 | 14304

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.