AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvc0/ir: use SM35 ISA with GK20A

Browse Source 
GK20A is mostly compatible with GK104, but uses the SM35 ISA. Use
the GK110 path when this chip is detected.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Alexandre Courbot
2014-05-27 16:03:02 +09:00
committed by Ilia Mirkin
parent 1973d79e27
commit ecee4c4229
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
+1 -1
View File
@@ -91,7 +91,7 @@ struct nv50_ir_prog_symbol
#define NVISA_GF100_CHIPSET_C0 0xc0
#define NVISA_GF100_CHIPSET_D0 0xd0
#define NVISA_GK104_CHIPSET 0xe0
#define NVISA_GK110_CHIPSET 0xf0
#define NVISA_GK20A_CHIPSET 0xea
#define NVISA_GM107_CHIPSET 0x110
struct nv50_ir_prog_info
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+1 -1
View File
@@ -3027,7 +3027,7 @@ TargetNVC0::createCodeEmitterNVC0(Program::Type type)
CodeEmitter *
TargetNVC0::getCodeEmitter(Program::Type type)
{
if (chipset >= NVISA_GK110_CHIPSET)
if (chipset >= NVISA_GK20A_CHIPSET)
return createCodeEmitterGK110(type);
return createCodeEmitterNVC0(type);
}
src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
+10 -5
View File
@@ -49,9 +49,12 @@ TargetNVC0::getBuiltinCode(const uint32_t **code, uint32_t *size) const
{
switch (chipset & ~0xf) {
case 0xe0:
*code = (const uint32_t *)&gk104_builtin_code[0];
*size = sizeof(gk104_builtin_code);
break;
if (chipset < NVISA_GK20A_CHIPSET) {
*code = (const uint32_t *)&gk104_builtin_code[0];
*size = sizeof(gk104_builtin_code);
break;
}
/* fall-through for GK20A */
case 0xf0:
case 0x100:
*code = (const uint32_t *)&gk110_builtin_code[0];
@@ -71,7 +74,9 @@ TargetNVC0::getBuiltinOffset(int builtin) const
switch (chipset & ~0xf) {
case 0xe0:
return gk104_builtin_offsets[builtin];
if (chipset < NVISA_GK20A_CHIPSET)
return gk104_builtin_offsets[builtin];
/* fall-through for GK20A */
case 0xf0:
case 0x100:
return gk110_builtin_offsets[builtin];
@@ -235,7 +240,7 @@ TargetNVC0::getFileSize(DataFile file) const
{
switch (file) {
case FILE_NULL: return 0;
case FILE_GPR: return (chipset >= NVISA_GK110_CHIPSET) ? 255 : 63;
case FILE_GPR: return (chipset >= NVISA_GK20A_CHIPSET) ? 255 : 63;
case FILE_PREDICATE: return 7;
case FILE_FLAGS: return 1;
case FILE_ADDRESS: return 0;