Attachment 18859 Details for Bug 17569 – finish pciaccess update

[patch] finish pciaccess update

0001-Missing-pciaccess-conversion-bits-for-alpha.patch (text/plain), 1.61 KB, created by Julien Cristau on 2008-09-14 07:30:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Cristau

Created: 2008-09-14 07:30:51 UTC

Size: 1.61 KB

patch

obsolete

>From 15bae5da950daab34dbee7d0495b035cda893218 Mon Sep 17 00:00:00 2001
>From: Julien Cristau <jcristau@debian.org>
>Date: Sun, 14 Sep 2008 14:46:52 +0200
>Subject: [PATCH] Missing pciaccess conversion bits for alpha
>
>---
> src/pm3_dac.c |   12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/src/pm3_dac.c b/src/pm3_dac.c
>index e11d190..6b00bdd 100644
>--- a/src/pm3_dac.c
>+++ b/src/pm3_dac.c
>@@ -437,9 +437,15 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
> 		       "VX1 secondary enabling VGA before int10\n");
> 
> 	    /* Enable VGA on the current card. */
>+#ifndef XSERVER_LIBPCIACCESS
> 	    pciWriteByte( pGlint->PciTag, 0xf8, 0 );
> 	    pciWriteByte( pGlint->PciTag, 0xf4, 0 );
> 	    pciWriteByte( pGlint->PciTag, 0xfc, 0 );
>+#else
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0, 0xf8);
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0, 0xf4);
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0, 0xfc);
>+#endif
> 
> 	    /* The card we are on should be VGA-enabled now, so run int10. */
> 	    if (xf86LoadSubModule(pScrn, "int10")) {
>@@ -455,9 +461,15 @@ Permedia3PreInit(ScrnInfoPtr pScrn)
> 		       "VX1 secondary disabling VGA after int10\n");
> 
> 	    /* Finally, disable VGA on the current card. */
>+#ifndef XSERVER_LIBPCIACCESS
> 	    pciWriteByte( pGlint->PciTag, 0xf8, 0x70 );
> 	    pciWriteByte( pGlint->PciTag, 0xf4, 0x01 );
> 	    pciWriteByte( pGlint->PciTag, 0xfc, 0x00 );
>+#else
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0x70, 0xf8);
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0x01, 0xf4);
>+	    pci_device_cfg_write_u8(pGlint->PciInfo, 0x00, 0xfc);
>+#endif
> 	}
>     }
> #endif /* __alpha__ */
>-- 
>1.5.6.5
>

Actions: View | Splinter Review

Attachments on bug 17569: 18859

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.