On Tue, Nov 24, 2020 at 6:38 AM Thomas Zimmermann <tzimmermann@xxxxxxx> wrote:
>
> Using struct drm_device.pdev is deprecated. Convert amdgpu to struct
> drm_device.dev. No functional changes.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Christian König <christian.koenig@xxxxxxx>
There are a few unrelated whitespace changes. Other than that, patch is:
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 ++++++++++-----------
> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 -
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 ++++-----
> drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 ++++-----
> 7 files changed, 25 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 7560b05e4ac1..d61715133825 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1404,9 +1404,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);
> @@ -1418,10 +1418,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;
> }
> }
> @@ -1684,8 +1684,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);
> @@ -3375,7 +3374,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)) {
> @@ -4922,8 +4921,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta
> case pci_channel_io_normal:
> return PCI_ERS_RESULT_CAN_RECOVER;
> /* Fatal error, prepare for slot reset */
> - case pci_channel_io_frozen:
> - /*
> + case pci_channel_io_frozen:
> + /*
> * Cancel and wait for all TDRs in progress if failing to
> * set adev->in_gpu_reset in amdgpu_device_lock_adev
> *
> @@ -5014,7 +5013,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)
> goto out;
> }
>
> - adev->in_pci_err_recovery = true;
> + adev->in_pci_err_recovery = true;
> r = amdgpu_device_pre_asic_reset(adev, NULL, &need_full_reset);
> adev->in_pci_err_recovery = false;
> if (r)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index 2e8a8b57639f..77974c3981fa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -721,13 +721,14 @@ 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;
>
> obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
> if (obj == NULL) {
> - dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
> + dev_err(&adev->pdev->dev, "No GEM object associated to handle 0x%08X, "
> "can't create framebuffer\n", mode_cmd->handles[0]);
> return ERR_PTR(-ENOENT);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 624294e0b9f3..bdc35c3f8523 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1192,7 +1192,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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index 0bf7d36c6686..51cd49c6f38f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -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:
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index c9f94fbeb018..18b8f896b7a3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -614,7 +614,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;
> @@ -622,7 +622,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);
> @@ -634,14 +634,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;
> }
> @@ -653,7 +653,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;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
> index 47cad23a6b9e..bca4dddd5a15 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
> @@ -176,7 +176,7 @@ struct amdgpu_i2c_chan *amdgpu_i2c_create(struct drm_device *dev,
> i2c->rec = *rec;
> i2c->adapter.owner = THIS_MODULE;
> i2c->adapter.class = I2C_CLASS_DDC;
> - i2c->adapter.dev.parent = &dev->pdev->dev;
> + i2c->adapter.dev.parent = dev->dev;
> i2c->dev = dev;
> i2c_set_adapdata(&i2c->adapter, i2c);
> mutex_init(&i2c->mutex);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 4ad6d801bc25..3fa44c318083 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -141,7 +141,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
> (amdgpu_is_atpx_hybrid() ||
> amdgpu_has_atpx_dgpu_power_cntl()) &&
> ((flags & AMD_IS_APU) == 0) &&
> - !pci_is_thunderbolt_attached(dev->pdev))
> + !pci_is_thunderbolt_attached(to_pci_dev(dev->dev)))
> flags |= AMD_IS_PX;
>
> /* amdgpu_device_init should report only fatal error
> @@ -152,7 +152,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
> */
> r = amdgpu_device_init(adev, flags);
> if (r) {
> - dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
> + dev_err(dev->dev, "Fatal error during GPU init\n");
> goto out;
> }
>
> @@ -192,7 +192,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
>
> acpi_status = amdgpu_acpi_init(adev);
> if (acpi_status)
> - dev_dbg(&dev->pdev->dev, "Error during ACPI methods call\n");
> + dev_dbg(dev->dev, "Error during ACPI methods call\n");
>
> if (adev->runpm) {
> /* only need to skip on ATPX */
> @@ -724,10 +724,10 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
> uint64_t vm_size;
>
> memset(&dev_info, 0, sizeof(dev_info));
> - dev_info.device_id = dev->pdev->device;
> + dev_info.device_id = adev->pdev->device;
> dev_info.chip_rev = adev->rev_id;
> dev_info.external_rev = adev->external_rev_id;
> - dev_info.pci_rev = dev->pdev->revision;
> + dev_info.pci_rev = adev->pdev->revision;
> dev_info.family = adev->family;
> dev_info.num_shader_engines = adev->gfx.config.max_shader_engines;
> dev_info.num_shader_arrays_per_engine = adev->gfx.config.max_sh_per_se;
> --
> 2.29.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel