diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-09-11 20:25:35 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-09-11 20:25:35 +0000 |
| commit | 2134086300bdab669f5b0359f2965c8a411cb8a3 (patch) | |
| tree | abfe0a49655fee04f812b4243a7faf1a5165aaae /driver/xf86-video-openchrome/src/via_video.c | |
| parent | 37aadccc1fd616f9b06536999a2919e4f12ed3b4 (diff) | |
Cherry-pick upstreams commit to convert the openchrome driver to
compat-api.h for compatibility with xserver 1.13.
Unfortunaltly recent versions of the driver are broken in the !dri
!kms case, so it cannot be upgraded.OA
Diffstat (limited to 'driver/xf86-video-openchrome/src/via_video.c')
| -rw-r--r-- | driver/xf86-video-openchrome/src/via_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/xf86-video-openchrome/src/via_video.c b/driver/xf86-video-openchrome/src/via_video.c index 59f124fda..5bcbd1c14 100644 --- a/driver/xf86-video-openchrome/src/via_video.c +++ b/driver/xf86-video-openchrome/src/via_video.c @@ -637,7 +637,7 @@ viaExitVideo(ScrnInfoPtr pScrn) void viaInitVideo(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VIAPtr pVia = VIAPTR(pScrn); XF86VideoAdaptorPtr *adaptors, *newAdaptors; int num_adaptors, num_new; @@ -721,7 +721,7 @@ viaInitVideo(ScreenPtr pScreen) static unsigned viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); viaPortPrivRec *viaPortPriv; DevUnion *pdevUnion; int i, j, usedPorts, numPorts; |