Attachment 5582 Details for Bug 6872 – proposed patch

[patch] proposed patch

radeon7000_errata_f1.diff (text/plain), 1.40 KB, created by Alex Williamson on 2006-05-10 01:47:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Williamson

Created: 2006-05-10 01:47:08 UTC

Size: 1.40 KB

patch

obsolete

>--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	14 Dec 2005 19:41:19 -0000	1.83
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	9 May 2006 14:47:37 -0000
>@@ -4320,13 +4320,34 @@ static Bool RADEONPreInitAccel(ScrnInfoP
> 
> static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
> {
>-    RADEONInfoPtr  info = RADEONPTR(pScrn);
>+    RADEONInfoPtr  info       = RADEONPTR(pScrn);
>+    unsigned char *RADEONMMIO = info->MMIO;
>+    CARD32 fp2_gen_ctl_save   = 0;
> 
> #if !defined(__powerpc__)
>     if (xf86LoadSubModule(pScrn, "int10")) {
> 	xf86LoaderReqSymLists(int10Symbols, NULL);
>+
>+#if defined(__ia64__)
>+	/* The VGA BIOS on the RV100/QY cannot be read when the digital output
>+	 * is enabled.  Clear and restore FP2_ON around int10 to avoid this.
>+	 */
>+	if (info->PciInfo->chipType == PCI_CHIP_RV100_QY) {
>+	    fp2_gen_ctl_save = INREG(RADEON_FP2_GEN_CNTL);
>+	    if (fp2_gen_ctl_save & RADEON_FP2_ON) {
>+		xf86DrvMsg(pScrn->scrnIndex,X_INFO,"disabling digital out\n");
>+		OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_ctl_save & ~RADEON_FP2_ON);	
>+	    }
>+	}
>+#endif
>+	
> 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
> 	*ppInt10 = xf86InitInt10(info->pEnt->index);
>+
>+	if (fp2_gen_ctl_save & RADEON_FP2_ON) {
>+	    xf86DrvMsg(pScrn->scrnIndex,X_INFO,"re-enabling digital out\n");
>+	    OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_ctl_save);	
>+	}
>     }
> #endif
>     return TRUE;

Actions: View | Splinter Review

Attachments on bug 6872: 5581 | 5582

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.