amd: split GFX1103 into GFX1103_R1 and GFX1103_R2

Fixes: caa09f66ae4 - amd: add chip identification for gfx1100-1103

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21041>
(cherry picked from commit 84d59cdb5971424a4297e288b852c8cc15c46163)

diff --git a/.pick_status.json b/.pick_status.json
index 7316836..635eec3 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2929,7 +2929,7 @@
         "description": "amd: split GFX1103 into GFX1103_R1 and GFX1103_R2",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "caa09f66ae4e97972ec9609896b4ad64a9c9d115"
     },

diff --git a/src/amd/addrlib/src/amdgpu_asic_addr.h b/src/amd/addrlib/src/amdgpu_asic_addr.h
index 36d39e5..34c16e2 100644 (file)
--- a/src/amd/addrlib/src/amdgpu_asic_addr.h
+++ b/src/amd/addrlib/src/amdgpu_asic_addr.h
@@ -116,7 +116,8 @@
 #define AMDGPU_GFX1101_RANGE    0x20, 0xFF //# 32 <= x < 255
 #define AMDGPU_GFX1102_RANGE    0x10, 0x20 //# 16 <= x < 32
 
-#define AMDGPU_GFX1103_RANGE    0x01, 0xFF //# 1 <= x < max
+#define AMDGPU_GFX1103_R1_RANGE 0x01, 0x10 //# 1 <= x < 16
+#define AMDGPU_GFX1103_R2_RANGE 0x80, 0xFF //# 128 <= x < max
 
 #define AMDGPU_REMBRANDT_RANGE  0x01, 0xFF //# 01 <= x < 255
 
@@ -187,7 +188,8 @@
 #define ASICREV_IS_GFX1100(r)          ASICREV_IS(r, GFX1100)
 #define ASICREV_IS_GFX1101(r)          ASICREV_IS(r, GFX1101)
 #define ASICREV_IS_GFX1102(r)          ASICREV_IS(r, GFX1102)
-#define ASICREV_IS_GFX1103(r)          ASICREV_IS(r, GFX1103)
+#define ASICREV_IS_GFX1103_R1(r)       ASICREV_IS(r, GFX1103_R1)
+#define ASICREV_IS_GFX1103_R2(r)       ASICREV_IS(r, GFX1103_R2)
 
 #define ASICREV_IS_REMBRANDT(r)        ASICREV_IS(r, REMBRANDT)
 

diff --git a/src/amd/addrlib/src/gfx11/gfx11addrlib.cpp b/src/amd/addrlib/src/gfx11/gfx11addrlib.cpp
index 9adc28a..af48e77 100644 (file)
--- a/src/amd/addrlib/src/gfx11/gfx11addrlib.cpp
+++ b/src/amd/addrlib/src/gfx11/gfx11addrlib.cpp
@@ -752,9 +752,6 @@ ChipFamily Gfx11Lib::HwlConvertChipFamily(
             }
             break;
         case FAMILY_GFX1103:
-            if (ASICREV_IS_GFX1103(chipRevision))
-            {
-            }
             break;
         default:
             ADDR_ASSERT(!"Unknown chip family");

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index 2745a2c..397130f 100644 (file)
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -834,7 +834,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info)
       identify_chip(GFX1102);
       break;
    case FAMILY_GFX1103:
-      identify_chip(GFX1103);
+      identify_chip(GFX1103_R1);
+      identify_chip(GFX1103_R2);
       break;
    }
 

diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c
index be65757..90ec21c 100644 (file)
--- a/src/amd/common/amd_family.c
+++ b/src/amd/common/amd_family.c
@@ -108,8 +108,10 @@ const char *ac_get_family_name(enum radeon_family family)
       return "GFX1101";
    case CHIP_GFX1102:
       return "GFX1102";
-   case CHIP_GFX1103:
-      return "GFX1103";
+   case CHIP_GFX1103_R1:
+      return "GFX1103_R1";
+   case CHIP_GFX1103_R2:
+      return "GFX1103_R2";
    default:
       unreachable("Unknown GPU family");
    }

diff --git a/src/amd/common/amd_family.h b/src/amd/common/amd_family.h
index 67e6ee2..fa2852a 100644 (file)
--- a/src/amd/common/amd_family.h
+++ b/src/amd/common/amd_family.h
@@ -131,7 +131,8 @@ enum radeon_family
    CHIP_GFX1100,
    CHIP_GFX1101,
    CHIP_GFX1102,
-   CHIP_GFX1103,
+   CHIP_GFX1103_R1,
+   CHIP_GFX1103_R2,
    CHIP_LAST,
 };
 

diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c
index bfd9ec7..558456b 100644 (file)
--- a/src/amd/llvm/ac_llvm_util.c
+++ b/src/amd/llvm/ac_llvm_util.c
@@ -183,7 +183,8 @@ const char *ac_get_llvm_processor_name(enum radeon_family family)
       return "gfx1101";
    case CHIP_GFX1102:
       return "gfx1102";
-   case CHIP_GFX1103:
+   case CHIP_GFX1103_R1:
+   case CHIP_GFX1103_R2:
       return "gfx1103";
    default:
       return "";

diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
index 414a8d6..3bdcc7d 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
@@ -3160,7 +3160,8 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
    case CHIP_GFX1100:
    case CHIP_GFX1101:
    case CHIP_GFX1102:
-   case CHIP_GFX1103:
+   case CHIP_GFX1103_R1:
+   case CHIP_GFX1103_R2:
       dec->jpg.direct_reg = true;
       dec->addr_gfx_mode = RDECODE_ARRAY_MODE_ADDRLIB_SEL_GFX11;
       dec->av1_version = RDECODE_AV1_VER_1;

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
index 1601234..a52bd78 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp
@@ -673,7 +673,7 @@ unsigned si_get_shader_prefetch_size(struct si_shader *shader)
    /* Return 0 for some A0 chips only. Other chips don't need it. */
    if ((shader->selector->screen->info.family == CHIP_GFX1100 ||
         shader->selector->screen->info.family == CHIP_GFX1102 ||
-        shader->selector->screen->info.family == CHIP_GFX1103) &&
+        shader->selector->screen->info.family == CHIP_GFX1103_R1) &&
        shader->selector->screen->info.chip_rev == 0)
       return 0;