Commit 5c1736cf authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-6-tzimmermann@suse.de
parent 02e415f8

drivers/gpu/drm/radeon/radeon.h

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/radeon/radeon_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/radeon/radeon_kms.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -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: