summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-18 04:49:17 (GMT)
committerDave Airlie <airlied@redhat.com>2011-05-24 05:56:18 (GMT)
commit82cb33c3f0e1ba802d7a94f3159b3c5c86cd4043 (patch)
tree71913a4a274e09ea68bbadffc82b3ddc7a666404
parentb77d374b0d11f48c33cfffdb4157c4ec4b05ea15 (diff)
cayman: enable all accel
-rw-r--r--src/evergreen_exa.c14
-rw-r--r--src/evergreen_textured_videofuncs.c3
2 files changed, 0 insertions, 17 deletions
diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 9a166b0..5752d0e 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -90,8 +90,6 @@ EVERGREENPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
struct r600_accel_object dst;
int scissor_height;
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- return FALSE;
if (!RADEONCheckBPP(pPix->drawable.bitsPerPixel))
RADEON_FALLBACK(("EVERGREENCheckDatatype failed\n"));
@@ -466,9 +464,6 @@ EVERGREENPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst,
struct radeon_accel_state *accel_state = info->accel_state;
struct r600_accel_object src_obj, dst_obj;
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- return FALSE;
-
if (!RADEONCheckBPP(pSrc->drawable.bitsPerPixel))
RADEON_FALLBACK(("EVERGREENCheckDatatype src failed\n"));
if (!RADEONCheckBPP(pDst->drawable.bitsPerPixel))
@@ -1126,9 +1121,6 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
float *cbuf;
int scissor_height;
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- return FALSE;
-
if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
return FALSE;
@@ -1467,9 +1459,6 @@ EVERGREENUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
}
}
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- goto copy;
-
scratch_pitch = RADEON_ALIGN(w, drmmode_get_pitch_align(pScrn, (bpp / 8), 0));
height = RADEON_ALIGN(h, drmmode_get_height_align(pScrn, 0));
base_align = drmmode_get_base_align(pScrn, (bpp / 8), 0);
@@ -1595,9 +1584,6 @@ EVERGREENDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w,
}
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- goto copy;
-
if (!accel_state->allowHWDFS)
goto copy;
diff --git a/src/evergreen_textured_videofuncs.c b/src/evergreen_textured_videofuncs.c
index ce5d2e1..6200cdc 100644
--- a/src/evergreen_textured_videofuncs.c
+++ b/src/evergreen_textured_videofuncs.c
@@ -114,9 +114,6 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
float *vs_alu_consts;
const_config_t vs_const_conf;
- if (info->ChipFamily == CHIP_FAMILY_CAYMAN)
- return;
-
cont = RTFContrast(pPriv->contrast);
bright = RTFBrightness(pPriv->brightness);
gamma = (float)pPriv->gamma / 1000.0;