diff options
| author | Egbert Eich <eich@freedesktop.org> | 2008-06-28 10:53:32 +0200 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2008-06-28 11:20:59 +0200 |
| commit | 46a0006177a7af85129f4bbb6899ffdea962fc86 (patch) | |
| tree | 6ee54a3617ef8bff87721761a5160532edd914d9 | |
| parent | f3e29a4dc84ab72ab39bd7f8e607900f7493d024 (diff) | |
2D: Comment out setctions not needed by this driver.
| -rw-r--r-- | src/radeon_commonfuncs.c | 14 | ||||
| -rw-r--r-- | src/radeon_exa_funcs.c | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index 8ef7661..9d1f545 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -168,8 +168,10 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) (info->ChipSet == RHD_M58) || (info->ChipSet == RHD_M66)) vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT); - /*else if (info->ChipSet == CHIP_FAMILY_R420) - vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);*/ +#ifndef RHD_DRIVER + else if (info->ChipSet == CHIP_FAMILY_R420) + vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT); +#endif else if ((info->ChipSet == RHD_R520) || (info->ChipSet == RHD_R580) || (info->ChipSet == RHD_RV570) || @@ -614,7 +616,9 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) OUT_ACCEL_REG(R300_SC_CLIP_RULE, 0xAAAA); OUT_ACCEL_REG(R300_SC_SCREENDOOR, 0xffffff); FINISH_ACCEL(); - } /*else if ((info->ChipFamily == CHIP_FAMILY_RV250) || + } +#ifndef RHD_DRIVER + else if ((info->ChipFamily == CHIP_FAMILY_RV250) || (info->ChipFamily == CHIP_FAMILY_RV280) || (info->ChipFamily == CHIP_FAMILY_RS300) || (info->ChipFamily == CHIP_FAMILY_R200)) { @@ -672,8 +676,8 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) RADEON_ROUND_MODE_ROUND | RADEON_ROUND_PREC_4TH_PIX)); FINISH_ACCEL(); - }*/ - + } +#endif } diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index 0f53d2a..994f1e8 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -548,7 +548,6 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) info->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1; info->exa->pixmapPitchAlign = 64; - //#ifdef RENDER if (info->ChipSet >= RHD_R600) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration " "unsupported on R600 and newer cards.\n"); @@ -565,7 +564,9 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) } else #endif xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EXA Composite requires CP on R5xx/IGP\n"); - } /*else if ((info->ChipFamily == CHIP_FAMILY_RV250) || + } +#ifndef RHD_DRIVER + else if ((info->ChipFamily == CHIP_FAMILY_RV250) || (info->ChipFamily == CHIP_FAMILY_RV280) || (info->ChipFamily == CHIP_FAMILY_RS300) || (info->ChipFamily == CHIP_FAMILY_R200)) { @@ -584,8 +585,8 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) FUNC_NAME(R100PrepareComposite); info->exa->Composite = FUNC_NAME(RadeonComposite); info->exa->DoneComposite = FUNC_NAME(RadeonDoneComposite); - }*/ - //#endif + } +#endif #if EXA_VERSION_MAJOR > 2 || (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 3) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting EXA maxPitchBytes\n"); |