diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:39 +0000 |
| commit | ec3f00ae3c2b6d521364161674ff5d88e10cc62c (patch) | |
| tree | 5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/radeon_accel.c | |
| parent | 42cbea1d05a9e44b0d560da29bff19711ebb8a94 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/radeon_accel.c')
| -rw-r--r-- | src/radeon_accel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 49690fb3..52955d4a 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -295,8 +295,10 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn) OUTREGP(RADEON_DP_DATATYPE, 0, ~RADEON_HOST_BIG_ENDIAN_EN); #endif - /* Restore SURFACE_CNTL */ - OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl); + /* Restore SURFACE_CNTL - only the first head contains valid data -ReneR */ + if (!info->IsSecondary) { + OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl); + } RADEONWaitForFifo(pScrn, 1); OUTREG(RADEON_DEFAULT_SC_BOTTOM_RIGHT, (RADEON_DEFAULT_SC_RIGHT_MAX |