diff options
| author | Thomas Hellström <thomas@shipmail.org> | 2009-01-17 17:30:13 +0000 |
|---|---|---|
| committer | Thomas Hellström <thomas@shipmail.org> | 2009-01-17 17:30:13 +0000 |
| commit | d21a04bd9ddf5510329c0e880fcf736a8c3202b8 (patch) | |
| tree | 9754b4cac2bdbb4db8758c9ae76df9c8fbf48fcd | |
| parent | 02280af119b11df34563afe4c272150089db884e (diff) | |
Fix video extension.
| -rw-r--r-- | src/via_dri.c | 6 | ||||
| -rw-r--r-- | src/via_video.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/via_dri.c b/src/via_dri.c index be5df8a..c757870 100644 --- a/src/via_dri.c +++ b/src/via_dri.c @@ -66,8 +66,8 @@ typedef struct static char VIAKernelDriverName[] = "via"; static char VIAClientDriverName[] = "unichrome"; -static const ViaDRMVersion drmExpected = { 3, 0, 0 }; -static const ViaDRMVersion drmCompat = { 3, 0, 0 }; +static const ViaDRMVersion drmExpected = { 4, 0, 0 }; +static const ViaDRMVersion drmCompat = { 4, 0, 0 }; static Bool VIAInitVisualConfigs(ScreenPtr pScreen); static Bool VIADRIMapInit(ScreenPtr pScreen, VIAPtr pVia); @@ -453,7 +453,7 @@ VIADRIFinishScreenInit(ScreenPtr pScreen) /* Set SAREA value. */ { struct drm_via_sarea *saPriv; - const char xvmc_ext[] = "via_dec_futex"; + const char xvmc_ext[] = "via_decoder_futex"; union drm_via_extension_arg arg; int ret; diff --git a/src/via_video.c b/src/via_video.c index 5542fc7..65bdbea 100644 --- a/src/via_video.c +++ b/src/via_video.c @@ -809,6 +809,7 @@ static unsigned viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + VIAPtr pVia = VIAPTR(pScrn); viaPortPrivRec *viaPortPriv; DevUnion *pdevUnion; int i, j, usedPorts, numPorts; |