diff options
| author | Roland Scheidegger <rscheidegger_lists@hispeed.ch> | 2006-03-17 03:00:53 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger_lists@hispeed.ch> | 2006-03-17 03:00:53 +0000 |
| commit | 323ecb92e40d71c5ef994b41b6d8dedba6dd6203 (patch) | |
| tree | 7f09fbd0ef4af24c270df6b29635b85bbabdd217 /src/radeon_video.c | |
| parent | dc552edf191e14249421f8b27146874f16b80c1a (diff) | |
Fix various small cosmetic issues. Change a driver message, get the order
right for requesting drm versions, replace the use of some numbers with
the respective macro defines in radeon_video.c, and add some more macro
defines. None of that really matters.
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index 891defca..3f44e4b8 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -1115,9 +1115,11 @@ RADEONResetVideo(ScrnInfoPtr pScrn) sprintf(tmp, "INSTANCE:%d", pScrn->scrnIndex); pPriv->instance_id = MAKE_ATOM(tmp); - OUTREG(RADEON_OV0_SCALE_CNTL, 0x80000000); + OUTREG(RADEON_OV0_SCALE_CNTL, RADEON_SCALER_SOFT_RESET); OUTREG(RADEON_OV0_AUTO_FLIP_CNTL, 0); /* maybe */ OUTREG(RADEON_OV0_EXCLUSIVE_HORZ, 0); + /* FIXME: we are not actually using the tap coefficients we program (twice!)? */ + OUTREG(RADEON_OV0_FILTER_CNTL, FILTER_HARDCODED_COEF); OUTREG(RADEON_OV0_FILTER_CNTL, 0x0000000f); OUTREG(RADEON_OV0_KEY_CNTL, RADEON_GRAPHIC_KEY_FN_EQ | RADEON_VIDEO_KEY_FN_FALSE | @@ -2569,9 +2571,9 @@ RADEONDisplayVideo( left = (left >> 16) & 7; RADEONWaitForFifo(pScrn, 2); - OUTREG(RADEON_OV0_REG_LOAD_CNTL, 1); + OUTREG(RADEON_OV0_REG_LOAD_CNTL, RADEON_REG_LD_CTL_LOCK); if (info->accelOn) RADEON_SYNC(info, pScrn); - while(!(INREG(RADEON_OV0_REG_LOAD_CNTL) & (1 << 3))); + while(!(INREG(RADEON_OV0_REG_LOAD_CNTL) & RADEON_REG_LD_CTL_LOCK_READBACK)); dsr=(double)(1<<0xC)/h_inc; if(dsr<0.25)dsr=0.25; |