From 08da896eb15d31944c4037209899b676296bee81 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 22 Dec 2021 01:38:36 +0000 Subject: [PATCH] %Lx -> %llx kernel printf does not support %Lx --- sys/dev/pci/drm/amd/amdgpu/amdgpu_gem.c | 4 ++-- sys/dev/pci/drm/amd/amdgpu/amdgpu_uvd.c | 8 ++++---- sys/dev/pci/drm/amd/amdgpu/amdgpu_vce.c | 6 +++--- sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gem.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gem.c index d65dd6ac4e3..cd9e4cdebae 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gem.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gem.c @@ -616,7 +616,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, if (args->va_address < AMDGPU_VA_RESERVED_SIZE) { dev_dbg(&dev->pdev->dev, - "va_address 0x%LX is in reserved area 0x%LX\n", + "va_address 0x%llX is in reserved area 0x%llX\n", args->va_address, AMDGPU_VA_RESERVED_SIZE); return -EINVAL; } @@ -624,7 +624,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, - "va_address 0x%LX is in VA hole 0x%LX-0x%LX\n", + "va_address 0x%llX is in VA hole 0x%llX-0x%llX\n", args->va_address, AMDGPU_GMC_HOLE_START, AMDGPU_GMC_HOLE_END); return -EINVAL; diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_uvd.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_uvd.c index f7e6dc38f16..5b5d2db02e4 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_uvd.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_uvd.c @@ -522,7 +522,7 @@ static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx) r = amdgpu_cs_find_mapping(ctx->parser, addr, &bo, &mapping); if (r) { - DRM_ERROR("Can't find BO for addr 0x%08Lx\n", addr); + DRM_ERROR("Can't find BO for addr 0x%08llx\n", addr); return r; } @@ -852,7 +852,7 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx) r = amdgpu_cs_find_mapping(ctx->parser, addr, &bo, &mapping); if (r) { - DRM_ERROR("Can't find BO for addr 0x%08Lx\n", addr); + DRM_ERROR("Can't find BO for addr 0x%08llx\n", addr); return r; } @@ -892,14 +892,14 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx) if (!ctx->parser->adev->uvd.address_64_bit) { if ((start >> 28) != ((end - 1) >> 28)) { - DRM_ERROR("reloc %LX-%LX crossing 256MB boundary!\n", + DRM_ERROR("reloc %llX-%llX crossing 256MB boundary!\n", start, end); return -EINVAL; } if ((cmd == 0 || cmd == 0x3) && (start >> 28) != (ctx->parser->adev->uvd.inst->gpu_addr >> 28)) { - DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n", + DRM_ERROR("msg/fb buffer %llX-%llX out of 256MB segment!\n", start, end); return -EINVAL; } diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vce.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vce.c index 903360d91a1..f7ea63c7f30 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vce.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vce.c @@ -607,7 +607,7 @@ static int amdgpu_vce_validate_bo(struct amdgpu_cs_parser *p, uint32_t ib_idx, r = amdgpu_cs_find_mapping(p, addr, &bo, &mapping); if (r) { - DRM_ERROR("Can't find BO for addr 0x%010Lx %d %d %d %d\n", + DRM_ERROR("Can't find BO for addr 0x%010llx %d %d %d %d\n", addr, lo, hi, size, index); return r; } @@ -648,14 +648,14 @@ static int amdgpu_vce_cs_reloc(struct amdgpu_cs_parser *p, uint32_t ib_idx, r = amdgpu_cs_find_mapping(p, addr, &bo, &mapping); if (r) { - DRM_ERROR("Can't find BO for addr 0x%010Lx %d %d %d %d\n", + DRM_ERROR("Can't find BO for addr 0x%010llx %d %d %d %d\n", addr, lo, hi, size, index); return r; } if ((addr + (uint64_t)size) > (mapping->last + 1) * AMDGPU_GPU_PAGE_SIZE) { - DRM_ERROR("BO too small for addr 0x%010Lx %d %d\n", + DRM_ERROR("BO too small for addr 0x%010llx %d %d\n", addr, lo, hi); return -EINVAL; } diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c index 20745dae9dd..8b636b62249 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c @@ -2309,8 +2309,8 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, tmp = amdgpu_vm_it_iter_first(&vm->va, saddr, eaddr); if (tmp) { /* bo and tmp overlap, invalid addr */ - dev_err(adev->dev, "bo %p va 0x%010Lx-0x%010Lx conflict with " - "0x%010Lx-0x%010Lx\n", bo, saddr, eaddr, + dev_err(adev->dev, "bo %p va 0x%010llx-0x%010llx conflict with " + "0x%010llx-0x%010llx\n", bo, saddr, eaddr, tmp->start, tmp->last + 1); return -EINVAL; } -- 2.20.1