drm/amdgpu: simplify amdgpu_ras_eeprom.c

From Alex Deucher
4ccb34d4313b81d6268b1e68bd9a4e7309f096f6 in linux-6.1.y/6.1.68
6246059a19d4cd32ef1af42a6ab016b779cd68c4 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ras_eeprom.c
index 2c2c845..8de7e24 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ras_eeprom.c
@@ -106,52 +106,13 @@
 #define to_amdgpu_device(x) (container_of(x, struct amdgpu_ras, eeprom_control))->adev
 
 static bool __is_ras_eeprom_supported(struct amdgpu_device *adev)
-{
-       if (adev->asic_type == CHIP_IP_DISCOVERY) {
-               switch (adev->ip_versions[MP1_HWIP][0]) {
-               case IP_VERSION(13, 0, 0):
-               case IP_VERSION(13, 0, 10):
-                       return true;
-               default:
-                       return false;
-               }
-       }
-
-       return  adev->asic_type == CHIP_VEGA20 ||
-               adev->asic_type == CHIP_ARCTURUS ||
-               adev->asic_type == CHIP_SIENNA_CICHLID ||
-               adev->asic_type == CHIP_ALDEBARAN;
-}
-
-static bool __get_eeprom_i2c_addr_arct(struct amdgpu_device *adev,
-                                      struct amdgpu_ras_eeprom_control *control)
-{
-       STUB();
-       return false;
-#ifdef notyet
-       struct atom_context *atom_ctx = adev->mode_info.atom_context;
-
-       if (!control || !atom_ctx)
-               return false;
-
-       if (strnstr(atom_ctx->vbios_version,
-                   "D342",
-                   sizeof(atom_ctx->vbios_version)))
-               control->i2c_address = EEPROM_I2C_MADDR_0;
-       else
-               control->i2c_address = EEPROM_I2C_MADDR_4;
-
-       return true;
-#endif
-}
-
-static bool __get_eeprom_i2c_addr_ip_discovery(struct amdgpu_device *adev,
-                                      struct amdgpu_ras_eeprom_control *control)
 {
        switch (adev->ip_versions[MP1_HWIP][0]) {
+       case IP_VERSION(11, 0, 2): /* VEGA20 and ARCTURUS */
+       case IP_VERSION(11, 0, 7): /* Sienna cichlid */
        case IP_VERSION(13, 0, 0):
+       case IP_VERSION(13, 0, 2): /* Aldebaran */
        case IP_VERSION(13, 0, 10):
-               control->i2c_address = EEPROM_I2C_MADDR_4;
                return true;
        default:
                return false;
@@ -182,19 +143,27 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev,
                return true;
        }
 
-       switch (adev->asic_type) {
-       case CHIP_VEGA20:
-               control->i2c_address = EEPROM_I2C_MADDR_0;
+       switch (adev->ip_versions[MP1_HWIP][0]) {
+       case IP_VERSION(11, 0, 2):
+               /* VEGA20 and ARCTURUS */
+               if (adev->asic_type == CHIP_VEGA20)
+                       control->i2c_address = EEPROM_I2C_MADDR_0;
+#ifdef notyet
+               else if (strnstr(atom_ctx->vbios_version,
+                                "D342",
+                                sizeof(atom_ctx->vbios_version)))
+                       control->i2c_address = EEPROM_I2C_MADDR_0;
+               else
+                       control->i2c_address = EEPROM_I2C_MADDR_4;
+#else
+               STUB();
+               control->i2c_address = EEPROM_I2C_MADDR_4;
+#endif
                return true;
-
-       case CHIP_ARCTURUS:
-               return __get_eeprom_i2c_addr_arct(adev, control);
-
-       case CHIP_SIENNA_CICHLID:
+       case IP_VERSION(11, 0, 7):
                control->i2c_address = EEPROM_I2C_MADDR_0;
                return true;
-
-       case CHIP_ALDEBARAN:
+       case IP_VERSION(13, 0, 2):
 #ifdef notyet
                if (strnstr(atom_ctx->vbios_version, "D673",
                            sizeof(atom_ctx->vbios_version)))
@@ -206,10 +175,10 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev,
                control->i2c_address = EEPROM_I2C_MADDR_0;
 #endif
                return true;
-
-       case CHIP_IP_DISCOVERY:
-               return __get_eeprom_i2c_addr_ip_discovery(adev, control);
-
+       case IP_VERSION(13, 0, 0):
+       case IP_VERSION(13, 0, 10):
+               control->i2c_address = EEPROM_I2C_MADDR_4;
+               return true;
        default:
                return false;
        }