Merge tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gem.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 174a73eb23f08117528f8a458a68e57d50f89a72..b443907afceadfebab03bec153292bff145d5a0a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -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;
        }