summaryrefslogtreecommitdiff
path: root/src/radeon_accel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/radeon_accel.c')
-rw-r--r--src/radeon_accel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index d45e932b..65ad33df 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
info->CurrentLayout.bitsPerPixel);
#ifdef XF86DRI
- if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) {
+ if (info->directRenderingEnabled && (IS_R300_3D || IS_R500_3D)) {
drmRadeonGetParam np;
int num_pipes;
@@ -419,11 +419,11 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
}
}
- if (IS_R300_3D | IS_R500_3D)
+ if (IS_R300_3D || IS_R500_3D)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"num pipes is %d\n", info->num_gb_pipes);
- if (IS_R300_3D | IS_R500_3D) {
+ if (IS_R300_3D || IS_R500_3D) {
uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
switch(info->num_gb_pipes) {