drm/amdgpu: Remove checking for atombios

This is a left over from radeon, amdgpu doesn't support any
non-atombios parts and amdgpu_device_init would bail if the
check for atombios failed anyway.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

7 files changed, 16 insertions, 34 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index f4f371fbce16..bea5747ef868 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1333,7 +1333,6 @@ struct amdgpu_device {
         /* BIOS */
         uint8_t                         *bios;
         uint32_t                        bios_size;
-        bool                            is_atom_bios;
         struct amdgpu_bo                *stollen_vga_memory;
         uint32_t                        bios_scratch[AMDGPU_BIOS_NUM_SCRATCH];
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 5796539a0bcb..ef79551b4cb7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -672,12 +672,10 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
 
                         if ((enc->devices & (ATOM_DEVICE_LCD_SUPPORT)) &&
                             enc->enc_priv) {
-                                if (adev->is_atom_bios) {
-                                        struct amdgpu_encoder_atom_dig *dig = enc->enc_priv;
-                                        if (dig->bl_dev) {
-                                                atif->encoder_for_bl = enc;
-                                                break;
-                                        }
+                                struct amdgpu_encoder_atom_dig *dig = enc->enc_priv;
+                                if (dig->bl_dev) {
+                                        atif->encoder_for_bl = enc;
+                                        break;
                                 }
                         }
                 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
index 8ec1967a850b..f573a953b4c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
@@ -394,15 +394,15 @@ bool amdgpu_get_bios(struct amdgpu_device *adev)
         if (!bios_header_start) {
                 goto free_bios;
         }
+
+        /* Must be an ATOMBIOS */
         tmp = bios_header_start + 4;
-        if (!memcmp(adev->bios + tmp, "ATOM", 4) ||
-            !memcmp(adev->bios + tmp, "MOTA", 4)) {
-                adev->is_atom_bios = true;
-        } else {
-                adev->is_atom_bios = false;
+        if (memcmp(adev->bios + tmp, "ATOM", 4) &&
+            memcmp(adev->bios + tmp, "MOTA", 4)) {
+                goto free_bios;
         }
 
-        DRM_DEBUG("%sBIOS detected\n", adev->is_atom_bios ? "ATOM" : "COM");
+        DRM_DEBUG("ATOMBIOS detected\n");
         return true;
 free_bios:
         kfree(adev->bios);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index fe3bb94fe58d..14550c85d6f2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1605,7 +1605,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         adev->pdev = pdev;
         adev->flags = flags;
         adev->asic_type = flags & AMD_ASIC_MASK;
-        adev->is_atom_bios = false;
         adev->usec_timeout = AMDGPU_MAX_USEC_TIMEOUT;
         adev->mc.gtt_size = 512 * 1024 * 1024;
         adev->accel_working = false;
@@ -1720,12 +1719,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
                 r = -EINVAL;
                 goto failed;
         }
-        /* Must be an ATOMBIOS */
-        if (!adev->is_atom_bios) {
-                dev_err(adev->dev, "Expecting atombios for GPU\n");
-                r = -EINVAL;
-                goto failed;
-        }
+
         r = amdgpu_atombios_init(adev);
         if (r) {
                 dev_err(adev->dev, "amdgpu_atombios_init failed\n");
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index d2036df145b3..48a3f677feca 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -582,12 +582,10 @@ int amdgpu_modeset_create_props(struct amdgpu_device *adev)
 {
         int sz;
 
-        if (adev->is_atom_bios) {
-                adev->mode_info.coherent_mode_property =
-                        drm_property_create_range(adev->ddev, 0 , "coherent", 0, 1);
-                if (!adev->mode_info.coherent_mode_property)
-                        return -ENOMEM;
-        }
+        adev->mode_info.coherent_mode_property =
+                drm_property_create_range(adev->ddev, 0 , "coherent", 0, 1);
+        if (!adev->mode_info.coherent_mode_property)
+                return -ENOMEM;
 
         adev->mode_info.load_detect_property =
                 drm_property_create_range(adev->ddev, 0, "load detection", 0, 1);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
index 91d367399956..f2739995c335 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
@@ -231,8 +231,7 @@ void amdgpu_i2c_init(struct amdgpu_device *adev)
         if (amdgpu_hw_i2c)
                 DRM_INFO("hw_i2c forced on, you may experience display detection problems!\n");
 
-        if (adev->is_atom_bios)
-                amdgpu_atombios_i2c_init(adev);
+        amdgpu_atombios_i2c_init(adev);
 }
 
 /* remove all the buses */
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
index c32eca26155c..2af26d2da127 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
@@ -181,9 +181,6 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode
         if (!amdgpu_encoder->enc_priv)
                 return;
 
-        if (!adev->is_atom_bios)
-                return;
-
         if (!(adev->mode_info.firmware_flags & ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU))
                 return;
 
@@ -236,9 +233,6 @@ amdgpu_atombios_encoder_fini_backlight(struct amdgpu_encoder *amdgpu_encoder)
         if (!amdgpu_encoder->enc_priv)
                 return;
 
-        if (!adev->is_atom_bios)
-                return;
-
         if (!(adev->mode_info.firmware_flags & ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU))
                 return;