Module: Mesa Branch: main Commit: 0b6a7cba0b46255a6b26049470be5ad555617445 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b6a7cba0b46255a6b26049470be5ad555617445
Author: Marek Olšák <[email protected]> Date: Sun Mar 19 14:52:16 2023 -0400 amd: rename GFX1036 -> RAPHAEL_MENDOCINO Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22084> --- src/amd/common/ac_gpu_info.c | 8 ++++---- src/amd/common/amd_family.c | 4 ++-- src/amd/common/amd_family.h | 2 +- src/amd/llvm/ac_llvm_util.c | 2 +- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 0c0cf050271..f37c85b480c 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -846,10 +846,10 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) identify_chip(REMBRANDT); break; case FAMILY_RPL: - identify_chip2(RAPHAEL, GFX1036); + identify_chip2(RAPHAEL, RAPHAEL_MENDOCINO); break; case FAMILY_MDN: - identify_chip2(MENDOCINO, GFX1036); + identify_chip2(MENDOCINO, RAPHAEL_MENDOCINO); break; case FAMILY_GFX1100: identify_chip(GFX1100); @@ -1031,7 +1031,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) case CHIP_FIJI: case CHIP_POLARIS12: case CHIP_VEGAM: - case CHIP_GFX1036: + case CHIP_RAPHAEL_MENDOCINO: info->l2_cache_size = info->num_tcc_blocks * 128 * 1024; break; default: @@ -1297,7 +1297,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) break; case CHIP_VANGOGH: case CHIP_REMBRANDT: - case CHIP_GFX1036: + case CHIP_RAPHAEL_MENDOCINO: pc_lines = 256; break; default: diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c index 3e08ed0c797..686b0b29e52 100644 --- a/src/amd/common/amd_family.c +++ b/src/amd/common/amd_family.c @@ -100,8 +100,8 @@ const char *ac_get_family_name(enum radeon_family family) return "NAVI24"; case CHIP_REMBRANDT: return "REMBRANDT"; - case CHIP_GFX1036: - return "GFX1036"; + case CHIP_RAPHAEL_MENDOCINO: + return "RAPHAEL_MENDOCINO"; case CHIP_GFX1100: return "GFX1100"; case CHIP_GFX1101: diff --git a/src/amd/common/amd_family.h b/src/amd/common/amd_family.h index da78b878f26..9699b8b9cbf 100644 --- a/src/amd/common/amd_family.h +++ b/src/amd/common/amd_family.h @@ -127,7 +127,7 @@ enum radeon_family CHIP_NAVI23, /* Radeon 6600 (formerly "Dimgrey Cavefish") */ CHIP_NAVI24, /* Radeon 6400, 6500 (formerly "Beige Goby") */ CHIP_REMBRANDT, /* Ryzen 6000 (formerly "Yellow Carp") */ - CHIP_GFX1036, + CHIP_RAPHAEL_MENDOCINO, /* Ryzen 7000(X), Ryzen 7045, Ryzen 7020 */ CHIP_GFX1100, CHIP_GFX1101, CHIP_GFX1102, diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c index d1dec4d2853..9f4913bb814 100644 --- a/src/amd/llvm/ac_llvm_util.c +++ b/src/amd/llvm/ac_llvm_util.c @@ -174,7 +174,7 @@ const char *ac_get_llvm_processor_name(enum radeon_family family) return LLVM_VERSION_MAJOR >= 13 ? "gfx1034" : "gfx1030"; case CHIP_REMBRANDT: return LLVM_VERSION_MAJOR >= 13 ? "gfx1035" : "gfx1030"; - case CHIP_GFX1036: /* TODO: LLVM 15 doesn't support this yet */ + case CHIP_RAPHAEL_MENDOCINO: /* TODO: LLVM 15 doesn't support this yet */ return "gfx1030"; case CHIP_GFX1100: return "gfx1100"; diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index be4b040d25c..5ca53d19e43 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -3203,7 +3203,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context, case CHIP_NAVI24: case CHIP_VANGOGH: case CHIP_REMBRANDT: - case CHIP_GFX1036: + case CHIP_RAPHAEL_MENDOCINO: dec->reg.data0 = RDECODE_VCN2_5_GPCOM_VCPU_DATA0; dec->reg.data1 = RDECODE_VCN2_5_GPCOM_VCPU_DATA1; dec->reg.cmd = RDECODE_VCN2_5_GPCOM_VCPU_CMD;
