diff options
author | Dave Airlie <airlied@linux.ie> | 2006-09-21 14:25:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-09-21 15:32:34 -0400 |
commit | 54a56ac583ac66f3f4bc2c4cc3ef9b0676770742 (patch) | |
tree | 7aeb381e897c6b247c1836788b1feb10a8048f74 /drivers/char/drm/radeon_state.c | |
parent | 2f02cc3fb8960754a2a5df6a33f53528e0d830be (diff) |
drm: use radeon specific names for radeon flags
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_state.c')
-rw-r--r-- | drivers/char/drm/radeon_state.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index bcfa1514a4d0..bb4b2e1a78c1 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
@@ -868,7 +868,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev, | |||
868 | */ | 868 | */ |
869 | dev_priv->sarea_priv->ctx_owner = 0; | 869 | dev_priv->sarea_priv->ctx_owner = 0; |
870 | 870 | ||
871 | if ((dev_priv->flags & CHIP_HAS_HIERZ) | 871 | if ((dev_priv->flags & RADEON_HAS_HIERZ) |
872 | && (flags & RADEON_USE_HIERZ)) { | 872 | && (flags & RADEON_USE_HIERZ)) { |
873 | /* FIXME : reverse engineer that for Rx00 cards */ | 873 | /* FIXME : reverse engineer that for Rx00 cards */ |
874 | /* FIXME : the mask supposedly contains low-res z values. So can't set | 874 | /* FIXME : the mask supposedly contains low-res z values. So can't set |
@@ -913,7 +913,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev, | |||
913 | for (i = 0; i < nbox; i++) { | 913 | for (i = 0; i < nbox; i++) { |
914 | int tileoffset, nrtilesx, nrtilesy, j; | 914 | int tileoffset, nrtilesx, nrtilesy, j; |
915 | /* it looks like r200 needs rv-style clears, at least if hierz is not enabled? */ | 915 | /* it looks like r200 needs rv-style clears, at least if hierz is not enabled? */ |
916 | if ((dev_priv->flags & CHIP_HAS_HIERZ) | 916 | if ((dev_priv->flags & RADEON_HAS_HIERZ) |
917 | && !(dev_priv->microcode_version == UCODE_R200)) { | 917 | && !(dev_priv->microcode_version == UCODE_R200)) { |
918 | /* FIXME : figure this out for r200 (when hierz is enabled). Or | 918 | /* FIXME : figure this out for r200 (when hierz is enabled). Or |
919 | maybe r200 actually doesn't need to put the low-res z value into | 919 | maybe r200 actually doesn't need to put the low-res z value into |
@@ -997,7 +997,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev, | |||
997 | } | 997 | } |
998 | 998 | ||
999 | /* TODO don't always clear all hi-level z tiles */ | 999 | /* TODO don't always clear all hi-level z tiles */ |
1000 | if ((dev_priv->flags & CHIP_HAS_HIERZ) | 1000 | if ((dev_priv->flags & RADEON_HAS_HIERZ) |
1001 | && (dev_priv->microcode_version == UCODE_R200) | 1001 | && (dev_priv->microcode_version == UCODE_R200) |
1002 | && (flags & RADEON_USE_HIERZ)) | 1002 | && (flags & RADEON_USE_HIERZ)) |
1003 | /* r100 and cards without hierarchical z-buffer have no high-level z-buffer */ | 1003 | /* r100 and cards without hierarchical z-buffer have no high-level z-buffer */ |
@@ -2992,9 +2992,9 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS) | |||
2992 | value = RADEON_SCRATCH_REG_OFFSET; | 2992 | value = RADEON_SCRATCH_REG_OFFSET; |
2993 | break; | 2993 | break; |
2994 | case RADEON_PARAM_CARD_TYPE: | 2994 | case RADEON_PARAM_CARD_TYPE: |
2995 | if (dev_priv->flags & CHIP_IS_PCIE) | 2995 | if (dev_priv->flags & RADEON_IS_PCIE) |
2996 | value = RADEON_CARD_PCIE; | 2996 | value = RADEON_CARD_PCIE; |
2997 | else if (dev_priv->flags & CHIP_IS_AGP) | 2997 | else if (dev_priv->flags & RADEON_IS_AGP) |
2998 | value = RADEON_CARD_AGP; | 2998 | value = RADEON_CARD_AGP; |
2999 | else | 2999 | else |
3000 | value = RADEON_CARD_PCI; | 3000 | value = RADEON_CARD_PCI; |