fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/gfx9: add GFX9 and VEGA10 enums

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-10-15 13:57:59 +02:00
parent 5691e14735
commit 68d6d097f1
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/common/amd_family.h
View file

@ -92,6 +92,7 @@ enum radeon_family {
CHIP_POLARIS10, CHIP_POLARIS10,
CHIP_POLARIS11, CHIP_POLARIS11,
CHIP_POLARIS12, CHIP_POLARIS12,
CHIP_VEGA10,
CHIP_LAST, CHIP_LAST,
}; };
@ -104,9 +105,10 @@ enum chip_class {
R700, R700,
EVERGREEN, EVERGREEN,
CAYMAN, CAYMAN,
SI, SI, /* GFX6 */
CIK, CIK, /* GFX7 */
VI, VI, /* GFX8 */
GFX9,
}; };
#endif #endif

1
src/gallium/drivers/radeon/r600_pipe_common.c
View file

@ -779,6 +779,7 @@ static const char* r600_get_chip_name(struct r600_common_screen *rscreen)
case CHIP_POLARIS11: return "AMD POLARIS11"; case CHIP_POLARIS11: return "AMD POLARIS11";
case CHIP_POLARIS12: return "AMD POLARIS12"; case CHIP_POLARIS12: return "AMD POLARIS12";
case CHIP_STONEY: return "AMD STONEY"; case CHIP_STONEY: return "AMD STONEY";
case CHIP_VEGA10: return "AMD VEGA10";
default: return "AMD unknown"; default: return "AMD unknown";
} }
} }

4
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -751,7 +751,9 @@ static void si_handle_env_var_force_family(struct si_screen *sscreen)
/* Override family and chip_class. */ /* Override family and chip_class. */
sscreen->b.family = sscreen->b.info.family = i; sscreen->b.family = sscreen->b.info.family = i;
if (i >= CHIP_TONGA) if (i >= CHIP_VEGA10)
sscreen->b.chip_class = sscreen->b.info.chip_class = GFX9;
else if (i >= CHIP_TONGA)
sscreen->b.chip_class = sscreen->b.info.chip_class = VI; sscreen->b.chip_class = sscreen->b.info.chip_class = VI;
else if (i >= CHIP_BONAIRE) else if (i >= CHIP_BONAIRE)
sscreen->b.chip_class = sscreen->b.info.chip_class = CIK; sscreen->b.chip_class = sscreen->b.info.chip_class = CIK;

7
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View file

@ -219,7 +219,9 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, int fd)
goto fail; goto fail;
} }
if (ws->info.family >= CHIP_TONGA) if (ws->info.family >= CHIP_VEGA10)
ws->info.chip_class = GFX9;
else if (ws->info.family >= CHIP_TONGA)
ws->info.chip_class = VI; ws->info.chip_class = VI;
else if (ws->info.family >= CHIP_BONAIRE) else if (ws->info.family >= CHIP_BONAIRE)
ws->info.chip_class = CIK; ws->info.chip_class = CIK;
@ -303,6 +305,9 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, int fd)
case CHIP_POLARIS12: case CHIP_POLARIS12:
ws->family = FAMILY_VI; ws->family = FAMILY_VI;
ws->rev_id = VI_POLARIS12_V_A0; ws->rev_id = VI_POLARIS12_V_A0;
case CHIP_VEGA10:
ws->family = FAMILY_AI;
ws->rev_id = AI_VEGA10_P_A0;
break; break;
default: default:
fprintf(stderr, "amdgpu: Unknown family.\n"); fprintf(stderr, "amdgpu: Unknown family.\n");