diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-06-29 08:45:35 -0400 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-06-29 08:45:35 -0400 |
| commit | 28f00c86fbfccb539af748ff13aa9d64b5da091b (patch) | |
| tree | 16cca90b10d39bffd36d74a2a92b1ffbf473df33 /src/via_memcpy.c | |
| parent | 6754933bb48a0fd306a62636f6fb0c540b85df7e (diff) | |
| parent | bb0329d5c4276bdcbfb457a9dcfffdda33d8954f (diff) | |
Merge branch 'master' into kms_branch
Conflicts:
configure.ac
src/Makefile.am
src/via_accel.c
src/via_cursor.c
src/via_dga.c
src/via_dri.c
src/via_driver.c
src/via_driver.h
src/via_eng_regs.h
src/via_memory.c
src/via_mode.c
src/via_panel.c
src/via_ums.h
src/via_xv.c
src/via_xv_overlay.c
Diffstat (limited to 'src/via_memcpy.c')
| -rw-r--r-- | src/via_memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/via_memcpy.c b/src/via_memcpy.c index 6eff2af..d4eb804 100644 --- a/src/via_memcpy.c +++ b/src/via_memcpy.c @@ -523,7 +523,7 @@ cpuValid(const char *cpuinfo, char **flags) vidCopyFunc viaVidCopyInit(char *copyType, ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); #ifdef linux char buf[BSIZ]; @@ -653,7 +653,7 @@ viaVidCopyInit(char *copyType, ScreenPtr pScreen) vidCopyFunc viaVidCopyInit(char *copyType, ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using default xfree86 memcpy for video.\n"); |