drm/radeon: Store PCI controller in struct radeon_device.hose

Moves struct drm_device.hose into struct radeon_device. The field in
struct DRM device is only for legacy drivers.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-6-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 6bcb851d7e22986584708c3ee86796be46684f2c..f09989bdce9840a5c955d9a53d2fa9e25d2f61ba 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2313,6 +2313,9 @@ struct radeon_device {
        struct device                   *dev;
        struct drm_device               *ddev;
        struct pci_dev                  *pdev;
+#ifdef __alpha__
+       struct pci_controller           *hose;
+#endif
        struct rw_semaphore             exclusive_lock;
        /* ASIC */
        union radeon_asic_config        config;

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 8193a2e9c415d2f5ad3014e4043011ea3f095d7f..efeb115ae70ece1ccb52dcfd877cb9e7e2d01820 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -342,10 +342,6 @@ static int radeon_pci_probe(struct pci_dev *pdev,
        if (ret)
                goto err_free;
 
-#ifdef __alpha__
-       dev->hose = pdev->sysdata;
-#endif
-
        pci_set_drvdata(pdev, dev);
 
        if (pci_find_capability(pdev, PCI_CAP_ID_AGP))

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 7c360d31ab6afe5a6a780430ebdafe84a9abb6f5..2479d6ab7a368c5f2d4e8fe84b1c1aa49d8a1892 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -115,6 +115,10 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
        }
        dev->dev_private = (void *)rdev;
 
+#ifdef __alpha__
+       rdev->hose = pdev->sysdata;
+#endif
+
        /* update BUS flag */
        if (pci_find_capability(pdev, PCI_CAP_ID_AGP)) {
                flags |= RADEON_IS_AGP;

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index d4328ff57757961ebb5a5084fcc42276f428a592..c6d575f50c482526eb6c17ef2ad46934ab9b19cc 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -324,7 +324,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_reso
                 * access, as done in ttm_bo_vm_fault().
                 */
                mem->bus.offset = (mem->bus.offset & 0x0ffffffffUL) +
-                       rdev->ddev->hose->dense_mem_base;
+                       rdev->hose->dense_mem_base;
 #endif
                break;
        default: