diff options
author | Adam Jackson <ajax@redhat.com> | 2014-05-21 14:10:11 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2014-05-21 14:10:11 -0400 |
commit | d74238ca2faddb2e1c0b48333664688a5079a856 (patch) | |
tree | 5f24d5d852a80d4edeca332dc93658a9f8146440 | |
parent | e7524461f8cb2a6e6e0bfb4f86bb3e3256708004 (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/s3v_driver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/s3v_driver.c b/src/s3v_driver.c index 654884c..937717e 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -3760,6 +3760,12 @@ S3Vddc1Read(ScrnInfoPtr pScrn) return ((unsigned int) (tmp & 0x08)); } +static void +S3Vddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) +{ + vgaHWddc1SetSpeed(pScrn, speed); +} + static Bool S3Vddc1(ScrnInfoPtr pScrn) { @@ -3773,7 +3779,7 @@ S3Vddc1(ScrnInfoPtr pScrn) OUTREG(DDC_REG,(tmp | 0x12)); if ((pMon = xf86PrintEDID( - xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(), + xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), S3Vddc1SetSpeed, S3Vddc1Read))) != NULL) success = TRUE; xf86SetDDCproperties(pScrn,pMon); |