diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-12-19 14:45:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-12-19 14:45:11 +1000 |
| commit | 78fb6c77f88d2ce5d2e1ec925958b97c51955ec6 (patch) | |
| tree | 6274899f56dc49238f4f58cf5aab0606e2e7a84a /src/radeon_crtc.c | |
| parent | f5e8c185001e62e744310667c2d1bd3fe6542a62 (diff) | |
| parent | ce4fa1cedec0cf56b9979dfaa12a8d3a7c643df4 (diff) | |
Merge branch 'master' into atombios-supportatombios-support
Conflicts:
src/radeon_display.c
Diffstat (limited to 'src/radeon_crtc.c')
| -rw-r--r-- | src/radeon_crtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c index 2d4ac15..8e66518 100644 --- a/src/radeon_crtc.c +++ b/src/radeon_crtc.c @@ -159,15 +159,13 @@ RADEONInitCommonRegisters(RADEONSavePtr save, RADEONInfoPtr info) static void RADEONInitSurfaceCntl(xf86CrtcPtr crtc, RADEONSavePtr save) { - ScrnInfoPtr pScrn = crtc->scrn; - save->surface_cntl = 0; #if X_BYTE_ORDER == X_BIG_ENDIAN /* We must set both apertures as they can be both used to map the entire * video memory. -BenH. */ - switch (pScrn->bitsPerPixel) { + switch (crtc->scrn->bitsPerPixel) { case 16: save->surface_cntl |= RADEON_NONSURF_AP0_SWP_16BPP; save->surface_cntl |= RADEON_NONSURF_AP1_SWP_16BPP; |