Commit aa96a16a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/r128: Remove references to struct drm_device.pdev 



Replace all references to struct drm_device's pdev field with
an upcast from dev.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210502104953.21768-4-tzimmermann@suse.de
parent b420fb8d

drivers/gpu/drm/r128/ati_pcigart.c

+6 −5
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static void drm_ati_free_pcigart_table(struct drm_device *dev, 
int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)

{

	struct drm_sg_mem *entry = dev->sg;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	unsigned long pages;

	int i;

	int max_pages;
@@ -96,8 +97,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info 
		for (i = 0; i < pages; i++) {

			if (!entry->busaddr[i])

				break;

			pci_unmap_page(dev->pdev, entry->busaddr[i],

					 PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

			pci_unmap_page(pdev, entry->busaddr[i], PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		}



		if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
@@ -116,6 +116,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
{

	struct drm_local_map *map = &gart_info->mapping;

	struct drm_sg_mem *entry = dev->sg;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	void *address = NULL;

	unsigned long pages;

	u32 *pci_gart = NULL, page_base, gart_idx;
@@ -131,7 +132,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {

		DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");



		if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) {

		if (pci_set_dma_mask(pdev, gart_info->table_mask)) {

			DRM_ERROR("fail to set dma mask to 0x%Lx\n",

				  (unsigned long long)gart_info->table_mask);

			ret = -EFAULT;
@@ -170,9 +171,9 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
	gart_idx = 0;

	for (i = 0; i < pages; i++) {

		/* we need to support large memory configurations */

		entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],

		entry->busaddr[i] = pci_map_page(pdev, entry->pagelist[i],

						 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		if (pci_dma_mapping_error(dev->pdev, entry->busaddr[i])) {

		if (pci_dma_mapping_error(pdev, entry->busaddr[i])) {

			DRM_ERROR("unable to map PCIGART pages!\n");

			drm_ati_pcigart_cleanup(dev, gart_info);

			address = NULL;

drivers/gpu/drm/r128/r128_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ static struct drm_driver driver = { 


int r128_driver_load(struct drm_device *dev, unsigned long flags)

{

	pci_set_master(dev->pdev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	pci_set_master(pdev);

	return drm_vblank_init(dev, 1);

}

drivers/gpu/drm/r128/r128_state.c

+2 −1
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ int r128_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv 
{

	drm_r128_private_t *dev_priv = dev->dev_private;

	drm_r128_getparam_t *param = data;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	int value;



	DEV_INIT_TEST_WITH_RETURN(dev_priv);
@@ -1590,7 +1591,7 @@ int r128_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv 


	switch (param->param) {

	case R128_PARAM_IRQ_NR:

		value = dev->pdev->irq;

		value = pdev->irq;

		break;

	default:

		return -EINVAL;