Revert "drm/amdgpu: disable runpm if we are the primary adapter"

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_drv.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 32a2ac5..48b0999 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -38,7 +38,6 @@
 #include <linux/mmu_notifier.h>
 #include <linux/suspend.h>
 #include <linux/cc_platform.h>
-#include <linux/fb.h>
 
 #include "amdgpu.h"
 #include "amdgpu_irq.h"
@@ -1960,26 +1959,6 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
 
 static const struct drm_driver amdgpu_kms_driver;
 
-static bool amdgpu_is_fw_framebuffer(resource_size_t base,
-                                    resource_size_t size)
-{
-       bool found = false;
-#if IS_REACHABLE(CONFIG_FB)
-       struct apertures_struct *a;
-
-       a = alloc_apertures(1);
-       if (!a)
-               return false;
-
-       a->ranges[0].base = base;
-       a->ranges[0].size = size;
-
-       found = is_firmware_framebuffer(a);
-       kfree(a);
-#endif
-       return found;
-}
-
 static void amdgpu_get_secondary_funcs(struct amdgpu_device *adev)
 {
        struct pci_dev *p = NULL;
@@ -2010,8 +1989,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
        unsigned long flags = ent->driver_data;
        int ret, retry = 0, i;
        bool supports_atomic = false;
-       bool is_fw_fb;
-       resource_size_t base, size;
 
        /* skip devices which are owned by radeon */
        for (i = 0; i < ARRAY_SIZE(amdgpu_unsupported_pciidlist); i++) {
@@ -2078,10 +2055,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
        }
 #endif
 
-       base = pci_resource_start(pdev, 0);
-       size = pci_resource_len(pdev, 0);
-       is_fw_fb = amdgpu_is_fw_framebuffer(base, size);
-
        /* Get rid of things like offb */
        ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver);
        if (ret)
@@ -2094,7 +2067,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
        adev->dev  = &pdev->dev;
        adev->pdev = pdev;
        ddev = adev_to_drm(adev);
-       adev->is_fw_fb = is_fw_fb;
 
        if (!supports_atomic)
                ddev->driver_features &= ~DRIVER_ATOMIC;