summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-05-21 14:11:46 -0400
committerAdam Jackson <ajax@redhat.com>2014-05-21 14:11:46 -0400
commit16a672d1ba183601d513c4cdca32b47e926a6d1e (patch)
treea75785762a2706f696c0609c916029845974b1ac
parent2e9217bb88b76cebfcd2b65b76c8733f80da77ea (diff)
Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server. Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/savage_driver.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index bca2c60..e82794f 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
return ((unsigned int) (tmp & 0x08));
}
+static void
+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+{
+ vgaHWddc1SetSpeed(pScrn, speed);
+}
+
static Bool
SavageDDC1(ScrnInfoPtr pScrn)
{
@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
InI2CREG(byte,psav->I2CPort);
OutI2CREG(byte | 0x12,psav->I2CPort);
- pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
+ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
+ SavageDDC1Read);
if (!pMon)
return FALSE;