Commit 8f66090b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/amdgpu: Remove references to struct drm_device.pdev 



Using struct drm_device.pdev is deprecated. Convert amdgpu to struct
drm_device.dev. No functional changes.

v3:
	* rebased

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210107080748.4768-3-tzimmermann@suse.de
parent 8a11d283

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+8 −9
Original line number Diff line number Diff line
@@ -1427,9 +1427,9 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, 
		/* don't suspend or resume card normally */

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;



		pci_set_power_state(dev->pdev, PCI_D0);

		amdgpu_device_load_pci_state(dev->pdev);

		r = pci_enable_device(dev->pdev);

		pci_set_power_state(pdev, PCI_D0);

		amdgpu_device_load_pci_state(pdev);

		r = pci_enable_device(pdev);

		if (r)

			DRM_WARN("pci_enable_device failed (%d)\n", r);

		amdgpu_device_resume(dev, true);
@@ -1441,10 +1441,10 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, 
		drm_kms_helper_poll_disable(dev);

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;

		amdgpu_device_suspend(dev, true);

		amdgpu_device_cache_pci_state(dev->pdev);

		amdgpu_device_cache_pci_state(pdev);

		/* Shut down the device */

		pci_disable_device(dev->pdev);

		pci_set_power_state(dev->pdev, PCI_D3cold);

		pci_disable_device(pdev);

		pci_set_power_state(pdev, PCI_D3cold);

		dev->switch_power_state = DRM_SWITCH_POWER_OFF;

	}

}
@@ -1707,8 +1707,7 @@ static void amdgpu_device_enable_virtual_display(struct amdgpu_device *adev) 
	adev->enable_virtual_display = false;



	if (amdgpu_virtual_display) {

		struct drm_device *ddev = adev_to_drm(adev);

		const char *pci_address_name = pci_name(ddev->pdev);

		const char *pci_address_name = pci_name(adev->pdev);

		char *pciaddstr, *pciaddstr_tmp, *pciaddname_tmp, *pciaddname;



		pciaddstr = kstrdup(amdgpu_virtual_display, GFP_KERNEL);
@@ -3401,7 +3400,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
		}

	}



	pci_enable_pcie_error_reporting(adev->ddev.pdev);

	pci_enable_pcie_error_reporting(adev->pdev);



	/* Post card if necessary */

	if (amdgpu_device_need_post(adev)) {

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+1 −0
Original line number Diff line number Diff line
@@ -926,6 +926,7 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 
				       struct drm_file *file_priv,

				       const struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct amdgpu_device *adev = drm_to_adev(dev);

	struct drm_gem_object *obj;

	struct amdgpu_framebuffer *amdgpu_fb;

	int ret;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	ddev->pdev = pdev;

	pci_set_drvdata(pdev, ddev);



	ret = amdgpu_driver_load_kms(adev, ent->driver_data);

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	DRM_INFO("fb depth is %d\n", fb->format->depth);

	DRM_INFO("   pitch is %d\n", fb->pitches[0]);



	vga_switcheroo_client_fb_set(adev_to_drm(adev)->pdev, info);

	vga_switcheroo_client_fb_set(adev->pdev, info);

	return 0;



out:

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+5 −5
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	int r = 0;



	if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {

		dev_dbg(&dev->pdev->dev,

		dev_dbg(dev->dev,

			"va_address 0x%LX is in reserved area 0x%LX\n",

			args->va_address, AMDGPU_VA_RESERVED_SIZE);

		return -EINVAL;
@@ -627,7 +627,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	if (args->va_address >= AMDGPU_GMC_HOLE_START &&

	    args->va_address < AMDGPU_GMC_HOLE_END) {

		dev_dbg(&dev->pdev->dev,

		dev_dbg(dev->dev,

			"va_address 0x%LX is in VA hole 0x%LX-0x%LX\n",

			args->va_address, AMDGPU_GMC_HOLE_START,

			AMDGPU_GMC_HOLE_END);
@@ -639,14 +639,14 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

	vm_size -= AMDGPU_VA_RESERVED_SIZE;

	if (args->va_address + args->map_size > vm_size) {

		dev_dbg(&dev->pdev->dev,

		dev_dbg(dev->dev,

			"va_address 0x%llx is in top reserved area 0x%llx\n",

			args->va_address + args->map_size, vm_size);

		return -EINVAL;

	}



	if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {

		dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",

		dev_dbg(dev->dev, "invalid flags combination 0x%08X\n",

			args->flags);

		return -EINVAL;

	}
@@ -658,7 +658,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	case AMDGPU_VA_OP_REPLACE:

		break;

	default:

		dev_dbg(&dev->pdev->dev, "unsupported operation %d\n",

		dev_dbg(dev->dev, "unsupported operation %d\n",

			args->operation);

		return -EINVAL;

	}