浏览代码

r600g: fix some winsys functions to deal properly with evergreen

Are these functions actually used anywhere?
tags/android-x86-2.2
Alex Deucher 14 年前
父节点
当前提交
271b7b5914
共有 2 个文件被更改,包括 15 次插入10 次删除
  1. 5
    5
      src/gallium/winsys/r600/drm/r600.c
  2. 10
    5
      src/gallium/winsys/r600/drm/radeon_pciid.c

+ 5
- 5
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;

+ 10
- 5
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;
}

正在加载...
取消
保存