summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-11-22 17:39:54 -0500
committerAlex Deucher <alexdeucher@gmail.com>2010-11-22 17:39:54 -0500
commit271b7b5914d4ec0ddb93b469f618c4b69c1e5e69 (patch)
tree298ee35121252d5697724243336670d0bf29e161
parentbf9c80976fdd6bcbd29c959f6313115b2b07f5df (diff)
r600g: fix some winsys functions to deal properly with evergreen
Are these functions actually used anywhere?
-rw-r--r--src/gallium/winsys/r600/drm/r600.c10
-rw-r--r--src/gallium/winsys/r600/drm/radeon_pciid.c15
2 files changed, 15 insertions, 10 deletions
diff --git a/src/gallium/winsys/r600/drm/r600.c b/src/gallium/winsys/r600/drm/r600.c
index 0a4d2e791d..b22f972173 100644
--- a/src/gallium/winsys/r600/drm/r600.c
+++ b/src/gallium/winsys/r600/drm/r600.c
@@ -93,6 +93,11 @@ struct radeon *r600_new(int fd, unsigned device)
case CHIP_RV730:
case CHIP_RV710:
case CHIP_RV740:
+ case CHIP_CEDAR:
+ case CHIP_REDWOOD:
+ case CHIP_JUNIPER:
+ case CHIP_CYPRESS:
+ case CHIP_HEMLOCK:
break;
case CHIP_R100:
case CHIP_RV100:
@@ -121,11 +126,6 @@ struct radeon *r600_new(int fd, unsigned device)
case CHIP_RV560:
case CHIP_RV570:
case CHIP_R580:
- case CHIP_CEDAR:
- case CHIP_REDWOOD:
- case CHIP_JUNIPER:
- case CHIP_CYPRESS:
- case CHIP_HEMLOCK:
default:
R600_ERR("unknown or unsupported chipset 0x%04X\n", r600->device);
break;
diff --git a/src/gallium/winsys/r600/drm/radeon_pciid.c b/src/gallium/winsys/r600/drm/radeon_pciid.c
index 08cc1c41e3..bd82158b32 100644
--- a/src/gallium/winsys/r600/drm/radeon_pciid.c
+++ b/src/gallium/winsys/r600/drm/radeon_pciid.c
@@ -472,6 +472,11 @@ int radeon_is_family_compatible(unsigned family1, unsigned family2)
case CHIP_RV730:
case CHIP_RV710:
case CHIP_RV740:
+ case CHIP_CEDAR:
+ case CHIP_REDWOOD:
+ case CHIP_JUNIPER:
+ case CHIP_CYPRESS:
+ case CHIP_HEMLOCK:
switch (family2) {
case CHIP_R600:
case CHIP_RV610:
@@ -485,6 +490,11 @@ int radeon_is_family_compatible(unsigned family1, unsigned family2)
case CHIP_RV730:
case CHIP_RV710:
case CHIP_RV740:
+ case CHIP_CEDAR:
+ case CHIP_REDWOOD:
+ case CHIP_JUNIPER:
+ case CHIP_CYPRESS:
+ case CHIP_HEMLOCK:
return 1;
default:
return 0;
@@ -517,11 +527,6 @@ int radeon_is_family_compatible(unsigned family1, unsigned family2)
case CHIP_RV560:
case CHIP_RV570:
case CHIP_R580:
- case CHIP_CEDAR:
- case CHIP_REDWOOD:
- case CHIP_JUNIPER:
- case CHIP_CYPRESS:
- case CHIP_HEMLOCK:
default:
return 0;
}